BUG25111218: Fix duplicate logic for reading EOF packet

nmariz · nmariz · commit 924482817fbf · 2016-11-17T11:37:29.000Z
Removed duplicate logic for reading EOF packet during query result read
from the server.

The code is unnecessary given the modifications to parse_eof(), which
correctly reads the EOF packet for versions with the new packet as well
as older versions without the modified EOF packet.
diff --git a/lib/mysql/connector/protocol.py b/lib/mysql/connector/protocol.py
@@ -318,7 +318,6 @@ def read_text_result(self, sock, version, count=1):
         eof = None
         rowdata = None
         i = 0
-        eof57 = version >= (5, 7, 5)
         while True:
             if eof or i == count:
                 break
@@ -334,10 +333,6 @@ def read_text_result(self, sock, version, count=1):
             elif (packet[4] == 254 and packet[0] < 7):
                 eof = self.parse_eof(packet)
                 rowdata = None
-            elif eof57 and (packet[4] == 0 and packet[0] > 9):
-                # EOF deprecation: make sure we catch it whether flag is set or not
-                eof = self.parse_ok(packet)
-                rowdata = None
             else:
                 eof = None
                 rowdata = utils.read_lc_string_list(packet[4:])
