Merge

mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

1 files changed, 9 insertions, 0 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 4000f494c63..3386118014a 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -294,6 +294,7 @@ Q_QUERY_VERTICAL, Q_QUERY_HORIZONTAL,
 Q_START_TIMER, Q_END_TIMER,
 Q_CHARACTER_SET, Q_DISABLE_PS_PROTOCOL, Q_ENABLE_PS_PROTOCOL,
 Q_EXIT,
+Q_DISABLE_RECONNECT, Q_ENABLE_RECONNECT,
 
 Q_UNKNOWN,			       /* Unknown command.   */
 Q_COMMENT,			       /* Comments, ignored. */
@@ -382,6 +383,8 @@ const char *command_names[]=
   "disable_ps_protocol",
   "enable_ps_protocol",
   "exit",
+  "disable_reconnect",
+  "enable_reconnect",
   0
 };
 
@@ -3895,6 +3898,12 @@ int main(int argc, char **argv)
       case Q_ENABLE_PS_PROTOCOL:
         ps_protocol_enabled= ps_protocol;
         break;
+      case Q_DISABLE_RECONNECT:
+        cur_con->mysql.reconnect= 0;
+        break;
+      case Q_ENABLE_RECONNECT:
+        cur_con->mysql.reconnect= 1;
+        break;
 
       case Q_EXIT:
         abort_flag= 1;