Merge branch 'REL9_5_STABLE' into PGPRO9_5

vbwagner · vbwagner · commit 8933d19e5224 · 2016-04-13T14:53:56.000+03:00
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
@@ -2217,15 +2217,23 @@ _SPI_execute_plan(SPIPlanPtr plan, ParamListInfo paramLI,
 				 */
 				if (IsA(stmt, CreateTableAsStmt))
 				{
-					Assert(strncmp(completionTag, "SELECT ", 7) == 0);
-					_SPI_current->processed = strtoul(completionTag + 7,
-													  NULL, 10);
+					CreateTableAsStmt *ctastmt = (CreateTableAsStmt *) stmt;
+
+					if (strncmp(completionTag, "SELECT ", 7) == 0)
+						_SPI_current->processed =
+							strtoul(completionTag + 7, NULL, 10);
+					else
+					{
+						/* Must be an IF NOT EXISTS that did nothing */
+						Assert(ctastmt->if_not_exists);
+						_SPI_current->processed = 0;
+					}
 
 					/*
 					 * For historical reasons, if CREATE TABLE AS was spelled
 					 * as SELECT INTO, return a special return code.
 					 */
-					if (((CreateTableAsStmt *) stmt)->is_select_into)
+					if (ctastmt->is_select_into)
 						res = SPI_OK_SELINTO;
 				}
 				else if (IsA(stmt, CopyStmt))
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
@@ -226,6 +226,12 @@ PLy_traceback(PyObject *e, PyObject *v, PyObject *tb,
 
 		PG_TRY();
 		{
+			/*
+			 * Ancient versions of Python (circa 2.3) contain a bug whereby
+			 * the fetches below can fail if the error indicator is set.
+			 */
+			PyErr_Clear();
+
 			lineno = PyObject_GetAttrString(tb, "tb_lineno");
 			if (lineno == NULL)
 				elog(ERROR, "could not get line number from Python traceback");
