Merge branch 'BUG18742429' into develop

peeyushgupta · peeyushgupta · commit 67883f8d9113 · 2014-06-23T13:41:00.000+05:30
diff --git a/lib/mysql/connector/protocol.py b/lib/mysql/connector/protocol.py
@@ -405,12 +405,12 @@ def _parse_binary_time(self, packet, field):
     def _parse_binary_values(self, fields, packet):
         """Parse values from a binary result packet"""
         null_bitmap_length = (len(fields) + 7 + 2) // 8
-        null_bitmap = utils.intread(packet[0:null_bitmap_length])
+        null_bitmap = [int(i) for i in packet[0:null_bitmap_length]]
         packet = packet[null_bitmap_length:]
 
         values = []
         for pos, field in enumerate(fields):
-            if null_bitmap & 1 << (pos + 2):
+            if null_bitmap[int((pos+2)/8)] & (1 << (pos + 2) % 8):
                 values.append(None)
                 continue
             elif field[1] in (FieldType.TINY, FieldType.SHORT,
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -2578,3 +2578,38 @@ def test_charset(self):
 
         self.assertEqual(exp_nonunicode, res_nonunicode)
         self.assertEqual(exp_unicode, res_unicode)
+
+
+class BugOra18742429(tests.MySQLConnectorTests):
+    """BUG#18742429:  CPY FAILS WHEN QUERYING LARGE NUMBER OF COLUMNS
+    """
+    def setUp(self):
+        config = tests.get_mysql_config()
+        self.cnx = connection.MySQLConnection(**config)
+        self.cursor = self.cnx.cursor()
+
+        self.tbl = 'Bug18742429'
+        self.cursor.execute("DROP TABLE IF EXISTS %s" % self.tbl)
+
+        create = 'CREATE TABLE {0}({1})'.format(self.tbl, ','.join(
+            ['col'+str(i)+' INT(10)' for i in range(1000)]))
+
+        self.cursor.execute(create)
+
+    def tearDown(self):
+        self.cursor.execute("DROP TABLE IF EXISTS %s" % self.tbl)
+        self.cursor.close()
+        self.cnx.close()
+
+    def test_columns(self):
+        stmt = "INSERT INTO {0} VALUES({1})".format(self.tbl, ','.join(
+            [str(i) if i%2==0 else 'NULL' for i in range(1000)]
+        ))
+        exp = tuple(i if i%2==0 else None for i in range(1000))
+        self.cursor.execute(stmt)
+
+        self.cursor = self.cnx.cursor(prepared=True)
+        stmt = 'SELECT * FROM {0} WHERE col0=?'.format(self.tbl)
+        self.cursor.execute(stmt, (0,))
+        self.assertEqual(exp, self.cursor.fetchone())
+
