Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/mysql_src/mysql-5.0-clean


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
tests/client_test.c:
  Auto merged

9 files changed, 15 insertions, 0 deletions

diff --git a/tests/client_test.c b/tests/client_test.c
index e6a530f786a..979c1563c02 100644
--- a/tests/client_test.c
+++ b/tests/client_test.c
@@ -243,6 +243,7 @@ static void client_connect()
     fprintf(stdout, "\n Check the connection options using --help or -?\n");
     exit(1);
   }
+  mysql->reconnect= 1;
 
   if (!opt_silent)
     fprintf(stdout, " OK");
@@ -1057,6 +1058,7 @@ static my_bool thread_query(char *query)
     error= 1;
     goto end;
   }
+  l_mysql->reconnect= 1;
   if (mysql_query(l_mysql, (char *)query))
   {
      fprintf(stderr, "Query failed (%s)\n", mysql_error(l_mysql));
@@ -4481,6 +4483,7 @@ static void test_stmt_close()
     myerror("connection failed");
     exit(1);
   }
+  lmysql->reconnect= 1;
   if (!opt_silent)
     fprintf(stdout, " OK");
 
@@ -5372,6 +5375,7 @@ DROP TABLE IF EXISTS test_multi_tab";
     fprintf(stdout, "\n connection failed(%s)", mysql_error(mysql_local));
     exit(1);
   }
+  mysql_local->reconnect= 1;
 
   rc= mysql_query(mysql_local, query);
   myquery(rc);
@@ -5480,6 +5484,7 @@ static void test_prepare_multi_statements()
     fprintf(stderr, "\n connection failed(%s)", mysql_error(mysql_local));
     exit(1);
   }
+  mysql_local->reconnect= 1;
   strmov(query, "select 1; select 'another value'");
   stmt= mysql_simple_prepare(mysql_local, query);
   check_stmt_r(stmt);
@@ -7012,6 +7017,7 @@ static void test_prepare_grant()
       mysql_close(lmysql);
       exit(1);
     }
+    lmysql->reconnect= 1;
     if (!opt_silent)
       fprintf(stdout, " OK");
 
@@ -7457,6 +7463,7 @@ static void test_drop_temp()
       mysql_close(lmysql);
       exit(1);
     }
+    lmysql->reconnect= 1;
     if (!opt_silent)
       fprintf(stdout, " OK");
 
diff --git a/tests/connect_test.c b/tests/connect_test.c
index fd81ad635ad..c68ade9f78f 100644
--- a/tests/connect_test.c
+++ b/tests/connect_test.c
@@ -46,6 +46,7 @@ int main(int argc, char **argv)
     perror("");
     exit(1);
   }
+  sock->reconnect= 1;
 
   if (mysql_select_db(sock,"test"))
   {
diff --git a/tests/deadlock_test.c b/tests/deadlock_test.c
index 65a0df5c215..ab8158e0cd8 100644
--- a/tests/deadlock_test.c
+++ b/tests/deadlock_test.c
@@ -227,6 +227,7 @@ int main()
      !mysql_real_connect(&sel, host, user, pass, db, 0,0,0 ) ||
      !mysql_real_connect(&del_ins, host, user, pass, db, 0,0,0 ))
     die("Error in mysql_real_connect(): %s", mysql_error(&lock));
+  lock.reconnect= sel.reconnect= del_ins.reconnect= 1;
 
   permute(order, num_queries);
   printf("count = %d\n", count);
diff --git a/tests/insert_test.c b/tests/insert_test.c
index 052c12bfdf0..2b659e9eecb 100644
--- a/tests/insert_test.c
+++ b/tests/insert_test.c
@@ -40,6 +40,7 @@ int main(int argc, char **argv)
     perror("");
     exit(1);
   }
+  mysql.reconnect= 1;
 
   num = atoi(argv[2]);
   count = 0;
diff --git a/tests/list_test.c b/tests/list_test.c
index 06bf16d2751..1d50e703133 100644
--- a/tests/list_test.c
+++ b/tests/list_test.c
@@ -43,6 +43,7 @@ int main(int argc, char **argv)
     perror("");
     exit(1);
   }
+  mysql.reconnect= 1;
 
   if (mysql_select_db(sock,argv[1]) < 0)
   {
diff --git a/tests/select_test.c b/tests/select_test.c
index ee2a9192865..64c4fec5167 100644
--- a/tests/select_test.c
+++ b/tests/select_test.c
@@ -44,6 +44,7 @@ int main(int argc, char **argv)
     perror("");
     exit(1);
   }
+  mysql.reconnect= 1;
 
   count = 0;
   num = atoi(argv[2]);
diff --git a/tests/showdb_test.c b/tests/showdb_test.c
index df2b3037c00..08229fc51ee 100644
--- a/tests/showdb_test.c
+++ b/tests/showdb_test.c
@@ -45,6 +45,7 @@ int main(int argc, char **argv)
     perror("");
     exit(1);
   }
+  mysql.reconnect= 1;
 
   count = 0;
   num = atoi(argv[2]);
diff --git a/tests/ssl_test.c b/tests/ssl_test.c
index b18e493c267..85f490cb02e 100644
--- a/tests/ssl_test.c
+++ b/tests/ssl_test.c
@@ -51,6 +51,7 @@ int main(int argc, char **argv)
     perror("");
     exit(1);
   }
+  mysql.reconnect= 1;
   count = 0;
   num = atoi(argv[2]);
   while (count < num)
diff --git a/tests/thread_test.c b/tests/thread_test.c
index 06f335fe1a6..f8577857d0a 100644
--- a/tests/thread_test.c
+++ b/tests/thread_test.c
@@ -55,6 +55,7 @@ unsigned __stdcall test_thread(void *arg __attribute__((unused)))
     perror("");
     goto end;
   }
+  mysql.reconnect= 1;
   if (verbose) { putchar('*'); fflush(stdout); }
   for (count=0 ; count < number_of_tests ; count++)
   {