Commit8933d19

committed

Merge branch 'REL9_5_STABLE' into PGPRO9_5

2 parentsb4967a7 +079013f commit8933d19Copy full SHA for 8933d19

File tree

+18

-4

lines changed

+18

-4

lines changed

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2217,15 +2217,23 @@ _SPI_execute_plan(SPIPlanPtr plan, ParamListInfo paramLI,`
`2217`	`2217`	`*/`
`2218`	`2218`	`if (IsA(stmt,CreateTableAsStmt))`
`2219`	`2219`	`{`
`2220`		`-Assert(strncmp(completionTag,"SELECT ",7)==0);`
`2221`		`-_SPI_current->processed=strtoul(completionTag+7,`
`2222`		`-NULL,10);`
	`2220`	`+CreateTableAsStmtctastmt= (CreateTableAsStmt)stmt;`
	`2221`	`+`
	`2222`	`+if (strncmp(completionTag,"SELECT ",7)==0)`
	`2223`	`+_SPI_current->processed=`
	`2224`	`+strtoul(completionTag+7,NULL,10);`
	`2225`	`+else`
	`2226`	`+{`
	`2227`	`+/* Must be an IF NOT EXISTS that did nothing */`
	`2228`	`+Assert(ctastmt->if_not_exists);`
	`2229`	`+_SPI_current->processed=0;`
	`2230`	`+}`
`2223`	`2231`
`2224`	`2232`	`/*`
`2225`	`2233`	`* For historical reasons, if CREATE TABLE AS was spelled`
`2226`	`2234`	`* as SELECT INTO, return a special return code.`
`2227`	`2235`	`*/`
`2228`		`-if (((CreateTableAsStmt*)stmt)->is_select_into)`
	`2236`	`+if (ctastmt->is_select_into)`
`2229`	`2237`	`res=SPI_OK_SELINTO;`
`2230`	`2238`	`}`
`2231`	`2239`	`elseif (IsA(stmt,CopyStmt))`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,12 @@ PLy_traceback(PyObject e, PyObject v, PyObject *tb,`
`226`	`226`
`227`	`227`	`PG_TRY();`
`228`	`228`	`{`
	`229`	`+/*`
	`230`	`+ * Ancient versions of Python (circa 2.3) contain a bug whereby`
	`231`	`+ * the fetches below can fail if the error indicator is set.`
	`232`	`+ */`
	`233`	`+PyErr_Clear();`
	`234`	`+`
`229`	`235`	`lineno=PyObject_GetAttrString(tb,"tb_lineno");`
`230`	`236`	`if (lineno==NULL)`
`231`	`237`	`elog(ERROR,"could not get line number from Python traceback");`

Comments

(0)