Fix auth fail on MySQL 5.1

methane · methane · commit 97b88bfec9b8 · 2016-01-14T12:06:14.000+09:00
diff --git a/pymysql/connections.py b/pymysql/connections.py
@@ -1051,7 +1051,6 @@ def _execute_command(self, command, sql):
 
     def _request_authentication(self):
         # https://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse
-        self.client_flag |= CLIENT.CAPABILITIES
         if int(self.server_version.split('.', 1)[0]) >= 5:
             self.client_flag |= CLIENT.MULTI_RESULTS
 
@@ -1073,7 +1072,7 @@ def _request_authentication(self):
         data = data_init + self.user + b'\0'
 
         authresp = b''
-        if self._auth_plugin_name == 'mysql_native_password':
+        if self._auth_plugin_name in ('', 'mysql_native_password'):
             authresp = _scramble(self.password.encode('latin1'), self.salt)
 
         if self.server_capabilities & CLIENT.PLUGIN_AUTH_LENENC_CLIENT_DATA:
