fix protocol out of sync when error happens while load local infile.

PyMySQL · methane · Jan 4, 2016 · Jan 3, 2016 · Jan 3, 2016 · Jan 3, 2016
commit 0eba140466f9ad58dcb996094d1bbe2f518d3244
diff --git a/pymysql/connections.py b/pymysql/connections.py
@@ -1327,7 +1327,11 @@ def _read_ok_packet(self, first_packet):
    def _read_load_local_packet(self, first_packet):
        load_packet = LoadLocalPacketWrapper(first_packet)
        sender = LoadLocalFile(load_packet.filename, self.connection)
-        sender.send_data()
+        try:
+            sender.send_data()
+        except:
+            self.connection._read_packet()  # skip ok packet
+            raise

        ok_packet = self.connection._read_packet()
        if not ok_packet.is_ok_packet(): # pragma: no cover - upstream induced protocol error
@@ -1448,7 +1452,7 @@ def send_data(self):

        try:
            with open(self.filename, 'rb') as open_file:
-                chunk_size = self.connection.max_allowed_packet
+                chunk_size = conn.max_allowed_packet
                packet = b""

                while True:

diff --git a/pymysql/tests/test_load_local.py b/pymysql/tests/test_load_local.py
@@ -61,6 +61,7 @@ def test_load_warnings(self):
                self.assertTrue("Incorrect integer value" in str(w[-1].message))
        finally:
            c.execute("DROP TABLE test_load_local")
+            c.close()


 if __name__ == "__main__":