From 84617169620e26a23d10c9051ccfa8a3c42db95f Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.(none)>
Date: Thu, 12 Oct 2006 13:49:12 +0200
Subject: [PATCH 1/2] Add win paths for mysql_client_test

---
 mysql-test/mysql-test-run.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index d4555e8ac00..29acd25138f 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1417,13 +1417,14 @@ sub executable_setup () {
   if ( $glob_use_embedded_server )
   {
     $exe_mysql_client_test=
-      mtr_exe_exists("$glob_basedir/libmysqld/examples/mysql_client_test_embedded",
-		     "$path_client_bindir/mysql_client_test_embedded");
+      mtr_exe_exists("$glob_basedir/libmysqld/examples/mysql_client_test_embedded");
   }
   else
   {
     $exe_mysql_client_test=
-      mtr_exe_exists("$path_client_bindir/mysql_client_test");
+      mtr_exe_exists("$glob_basedir/tests/mysql_client_test",
+		     "$glob_basedir/tests/release/mysql_client_test"
+		     "$glob_basedir/tests/debug/mysql_client_test");
   }
 }
 

From 7405e7792de531d34cab00d1eadf011539e95cf9 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.(none)>
Date: Thu, 12 Oct 2006 13:50:50 +0200
Subject: [PATCH 2/2] Move the reconnect variable to beginning of function Fix
 warning about value from "*ptr++" not being used. Changed it to ptr++

---
 client/mysqltest.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index db15c6c43dd..e2317560404 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -2709,12 +2709,12 @@ char *get_string(char **to_ptr, char **from_ptr,
 
 void set_reconnect(MYSQL* mysql, int val)
 {
+  my_bool reconnect= val;
   DBUG_ENTER("set_reconnect");
   DBUG_PRINT("info", ("val: %d", val));
 #if MYSQL_VERSION_ID < 50000
-  mysql->reconnect= val;
+  mysql->reconnect= reconnect;
 #else
-  my_bool reconnect= val;
   mysql_options(mysql, MYSQL_OPT_RECONNECT, (char *)&reconnect);
 #endif
   DBUG_VOID_RETURN;
@@ -3609,7 +3609,7 @@ void scan_command_for_warnings(struct st_command *command)
       *end= save;
     }
 
-    *ptr++;
+    ptr++;
   }
   DBUG_VOID_RETURN;
 }