BUG20407036: Fix incorrect arguments to mysld_stmt_execute error

peeyushgupta · Geert Vanderkelen · commit 6c069896b1f6 · 2015-03-25T07:40:41.000+01:00
Inserting a string of length 251 to 255 using prepared statements was raising a ProgrammingError exception: 1210 (HY000): Incorrect arguments to mysqld_stmt_execute We fix this by correctly encoding the length of the string while sending it to the server. A test case has been added for BUG#20407036. (cherry picked from commit 955cfb7)
diff --git a/lib/mysql/connector/utils.py b/lib/mysql/connector/utils.py
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2015, 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
@@ -144,7 +144,7 @@ def lc_int(i):
     if i < 0 or i > 18446744073709551616:
         raise ValueError('Requires 0 <= i <= 2^64')
 
-    if i <= 255:
+    if i < 251:
         return bytearray(struct.pack('<B', i))
     elif i <= 65535:
         return b'\xfc' + bytearray(struct.pack('<H', i))
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2015, 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
@@ -3110,3 +3110,47 @@ def test_warning_with_rows(self):
         exp = [(u'Warning', 1642, u'TEST WARNING')]
         self.assertEqual(exp, cur.fetchwarnings())
         cur.close()
+
+
+class BugOra20407036(tests.MySQLConnectorTests):
+    """BUG#20407036:  INCORRECT ARGUMENTS TO MYSQLD_STMT_EXECUTE ERROR
+    """
+    def setUp(self):
+        config = tests.get_mysql_config()
+        self.cnx = connection.MySQLConnection(**config)
+        self.cur = self.cnx.cursor()
+
+        self.tbl = 'Bug20407036'
+        self.cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl))
+
+        create = ("CREATE TABLE {0} ( id int(10) unsigned NOT NULL, "
+                  "text VARCHAR(70000) CHARACTER SET utf8 NOT NULL, "
+                  "rooms tinyint(3) unsigned NOT NULL) "
+                  "ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 "
+                  "COLLATE=utf8_unicode_ci".format(self.tbl))
+        self.cur.execute(create)
+
+    def tearDown(self):
+        self.cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl))
+        self.cur.close()
+        self.cnx.close()
+
+    def test_binary_charset(self):
+        cur = self.cnx.cursor(prepared=True)
+        sql = "INSERT INTO {0}(text, rooms) VALUES(%s, %s)".format(self.tbl)
+        cur.execute(sql, ('a'*252, 1))
+        cur.execute(sql, ('a'*253, 2))
+        cur.execute(sql, ('a'*255, 3))
+        cur.execute(sql, ('a'*251, 4))
+        cur.execute(sql, ('a'*65535, 5))
+
+        exp = [
+            (0, 'a'*252, 1),
+            (0, 'a'*253, 2),
+            (0, 'a'*255, 3),
+            (0, 'a'*251, 4),
+            (0, 'a'*65535, 5),
+        ]
+
+        self.cur.execute("SELECT * FROM {0}".format(self.tbl))
+        self.assertEqual(exp, self.cur.fetchall())
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2015, 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
@@ -125,12 +125,12 @@ def test_intstore(self):
 
     def test_lc_int(self):
         prefix = (b'', b'\xfc', b'\xfd', b'\xfe')
+        intstore = (1, 2, 3, 8)
         try:
-            for i, j in enumerate((8, 16, 24, 64)):
-                val = 2 ** (j - 1)
-                lenenc = utils.lc_int(val)
+            for i, j in enumerate((128, 251, 2**24-1, 2**64-1)):
+                lenenc = utils.lc_int(j)
                 exp = prefix[i] + \
-                    getattr(utils, 'int{0}store'.format(int(j/8)))(val)
+                    getattr(utils, 'int{0}store'.format(intstore[i]))(j)
                 self.assertEqual(exp, lenenc)
         except ValueError as err:
             self.fail("length_encoded_int failed for size {0}".format(j, err))
