Merging from mysql-5.5 to mysql-5.6

Arun Kuruvila · Arun Kuruvila · commit b0f72a4efe73 · 2014-11-10T16:24:19.000+05:30
diff --git a/sql-common/client.c b/sql-common/client.c
@@ -4065,8 +4065,8 @@ void STDCALL mysql_close(MYSQL *mysql)
     {
       free_old_query(mysql);
       mysql->status=MYSQL_STATUS_READY; /* Force command */
-      mysql->reconnect=0;
       simple_command(mysql,COM_QUIT,(uchar*) 0,0,1);
+      mysql->reconnect=0;
       end_server(mysql);			/* Sets mysql->net.vio= 0 */
     }
     mysql_close_free_options(mysql);
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -1675,9 +1675,17 @@ int ha_federated::close(void)
   DBUG_ENTER("ha_federated::close");
 
   free_result();
-  
+
   delete_dynamic(&results);
-  
+
+  /*
+    Check to verify wheather the connection is still alive or not.
+    FLUSH TABLES will quit the connection and if connection is broken,
+    it will reconnect again and quit silently.
+  */
+  if (mysql && !vio_is_connected(mysql->net.vio))
+     mysql->net.error= 2;
+
   /* Disconnect from mysql */
   mysql_close(mysql);
   mysql= NULL;

Original file line number	Diff line number	Diff line change
`@@ -4065,8 +4065,8 @@ void STDCALL mysql_close(MYSQL *mysql)`
`4065`	`4065`	`{`
`4066`	`4066`	`free_old_query(mysql);`
`4067`	`4067`	`mysql->status=MYSQL_STATUS_READY; /* Force command */`
`4068`		`- mysql->reconnect=0;`
`4069`	`4068`	`simple_command(mysql,COM_QUIT,(uchar*) 0,0,1);`
	`4069`	`+ mysql->reconnect=0;`
`4070`	`4070`	`end_server(mysql); /* Sets mysql->net.vio= 0 */`
`4071`	`4071`	`}`
`4072`	`4072`	`mysql_close_free_options(mysql);`