Merge branch 'BUG18798953' into develop

peeyushgupta · peeyushgupta · commit 293f362092d7 · 2014-08-13T16:06:57.000+05:30
diff --git a/lib/mysql/connector/connection.py b/lib/mysql/connector/connection.py
@@ -452,6 +452,17 @@ def connect(self, **kwargs):
         self._open_connection()
         self._post_connection()
 
+    def shutdown(self):
+        """Shut down connection to MySQL Server.
+        """
+        if not self._socket:
+            return
+
+        try:
+            self._socket.shutdown()
+        except (AttributeError, errors.Error):
+            pass  # Getting an exception would mean we are disconnected.
+
     def disconnect(self):
         """Disconnect from the MySQL server
         """
diff --git a/lib/mysql/connector/network.py b/lib/mysql/connector/network.py
@@ -98,6 +98,15 @@ def get_address(self):
         """Get the location of the socket"""
         raise NotImplementedError
 
+    def shutdown(self):
+        """Shut down the socket before closing it"""
+        try:
+            self.sock.shutdown(socket.SHUT_RDWR)
+            self.sock.close()
+            del self._packet_queue
+        except (socket.error, AttributeError):
+            pass
+
     def close_connection(self):
         """Close the socket"""
         try:
diff --git a/tests/test_connection.py b/tests/test_connection.py
@@ -31,6 +31,7 @@
 import unittest
 from decimal import Decimal
 import io
+import socket
 
 import tests
 from . import PY2
@@ -1820,6 +1821,31 @@ def test_cmd_reset_connection(self):
             else:
                 self.assertNotEqual((b'2',), self.cnx.get_rows()[0][0])
 
+    def test_shutdown(self):
+        """Shutting down a connection"""
+        config = tests.get_mysql_config()
+        cnx = connection.MySQLConnection(**config)
+        sql = "SHOW GLOBAL STATUS WHERE variable_name LIKE 'Aborted_clients'"
+        cur = cnx.cursor()
+        cur.execute(sql)
+        aborted_clients = cur.fetchone()[1]
+
+        test_close_cnx = connection.MySQLConnection(**config)
+        test_shutdown_cnx = connection.MySQLConnection(**config)
+
+        test_close_cnx.close()
+        cur.execute(sql)
+        self.assertEqual(aborted_clients, cur.fetchone()[1])
+
+        test_shutdown_cnx.shutdown()
+        self.assertRaises(socket.error,
+                          test_shutdown_cnx._socket.sock.getsockname)
+        cur.execute(sql)
+        self.assertEqual(str(int(aborted_clients) + 1), cur.fetchone()[1])
+
+        cur.close()
+        cnx.close()
+
 
 class WL7937(tests.MySQLConnectorTests):
     """Allow 'LOAD DATA LOCAL INFILE' by default
diff --git a/tests/test_network.py b/tests/test_network.py
@@ -106,6 +106,11 @@ def test_get_address(self):
         """Get the address of a connection"""
         self.assertRaises(NotImplementedError, self.cnx.get_address)
 
+    def test_shutdown(self):
+        """Shutting down a connection"""
+        self.cnx.shutdown()
+        self.assertEqual(None, self.cnx.sock)
+
     def test_close_connection(self):
         """Closing a connection"""
         self.cnx.close_connection()
