BUG22476689: Importing world.sql fails with cext enabled

nmariz · nmariz · commit dc138a999b88 · 2017-03-17T18:28:31.000Z
This patch fixes the importing of world.sql with the
C extension enabled.

A test was added for regression.
diff --git a/lib/mysql/connector/cursor_cext.py b/lib/mysql/connector/cursor_cext.py
@@ -205,7 +205,10 @@ def _execute_iter(self):
                 if exc.errno != CR_NO_RESULT_SET:
                     raise
             i += 1
-            self._executed = executed_list[i].strip()
+            try:
+                self._executed = executed_list[i].strip()
+            except IndexError:
+                self._executed = executed_list[0]
             yield self
         return
 
diff --git a/tests/cext/test_cext_cursor.py b/tests/cext/test_cext_cursor.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -29,6 +29,7 @@
 import unittest
 
 from mysql.connector import errors, errorcode
+from .. import PY2
 
 import tests
 
@@ -516,6 +517,28 @@ def tests_execute_multi(self):
         cur.close()
         self.cnx.rollback()
 
+        cur = self._get_cursor(self.cnx)
+        cur.execute("DROP PROCEDURE IF EXISTS multi_results")
+        procedure = (
+            "CREATE PROCEDURE multi_results () "
+            "BEGIN SELECT 1; SELECT 'ham'; END"
+        )
+        cur.execute(procedure)
+        stmt = "CALL multi_results()"
+        if not PY2:
+            stmt = b"CALL multi_results()"
+        exp_result = [[(1,)], [(u'ham',)]]
+        results = []
+        for result in cur.execute(stmt, multi=True):
+            if result.with_rows:
+                self.assertEqual(stmt, result._executed)
+                results.append(result.fetchall())
+
+        self.assertEqual(exp_result, results)
+        cur.execute("DROP PROCEDURE multi_results")
+
+        cur.close()
+
 
 class CExtMySQLCursorBufferedTests(tests.CMySQLCursorTests):
 
