Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

client/mysqltest.c

@@ -668,9 +668,11 @@ void close_files()
   DBUG_ENTER("close_files");
   for (; cur_file >= file_stack; cur_file--)
   {
-    DBUG_PRINT("info", ("file_name: %s", cur_file->file_name));
     if (cur_file->file && cur_file->file != stdin)
+    {
+      DBUG_PRINT("info", ("closing file: %s", cur_file->file_name));
       my_fclose(cur_file->file, MYF(0));
+    }
     my_free((gptr)cur_file->file_name, MYF(MY_ALLOW_ZERO_PTR));
     cur_file->file_name= 0;
   }
@@ -950,8 +952,8 @@ err:
 
 void check_result(DYNAMIC_STRING* ds)
 {
-  DBUG_ASSERT(result_file_name);
   DBUG_ENTER("check_result");
+  DBUG_ASSERT(result_file_name);
 
   switch (dyn_string_cmp(ds, result_file_name))
   {
@@ -2707,12 +2709,15 @@ char *get_string(char **to_ptr, char **from_ptr,
 
 void set_reconnect(MYSQL* mysql, int val)
 {
+  DBUG_ENTER("set_reconnect");
+  DBUG_PRINT("info", ("val: %d", val));
 #if MYSQL_VERSION_ID < 50000
   mysql->reconnect= val;
 #else
-  int reconnect= val;
+  my_bool reconnect= val;
   mysql_options(mysql, MYSQL_OPT_RECONNECT, (char *)&reconnect);
 #endif
+  DBUG_VOID_RETURN;
 }
 
 

mysql-test/lib/mtr_process.pl

@@ -339,19 +339,6 @@ sub mtr_kill_leftovers () {
   mtr_report("Killing Possible Leftover Processes");
   mtr_debug("mtr_kill_leftovers(): started.");
 
-  mkpath("$::opt_vardir/log"); # Needed for mysqladmin log
-
-  # Stop or kill Instance Manager and all its children. If we failed to do
-  # that, we can only abort -- there is nothing left to do.
-
-#  mtr_error("Failed to stop Instance Manager.")
-#    unless mtr_im_stop($::instance_manager);
-
-  # Start shutdown of masters and slaves. Don't touch IM-managed mysqld
-  # instances -- they should be stopped by mtr_im_stop().
-
-  mtr_debug("Shutting down mysqld-instances...");
-
   my @kill_pids;
   my %admin_pids;
 

mysql-test/mysql-test-run.pl

@@ -310,7 +310,7 @@ sub command_line_setup ();
 sub datadir_setup ();
 sub executable_setup ();
 sub environment_setup ();
-sub kill_running_server ();
+sub kill_running_servers ();
 sub cleanup_stale_files ();
 sub check_ssl_support ($);
 sub check_running_as_root();
@@ -1802,7 +1802,7 @@ sub handle_int_signal () {
 #
 ##############################################################################
 
-sub kill_running_server () {
+sub kill_running_servers () {
 
   if ( $opt_fast or $glob_use_embedded_server )
   {
@@ -1820,6 +1820,13 @@ sub kill_running_server () {
     # started from this run of the script, this is terminating
     # leftovers from previous runs.
 
+    if ( ! -d $opt_vardir )
+    {
+      # The "var" dir does not exist already
+      # the processes that mtr_kill_leftovers start will write
+      # their log files to var/log so it should be created
+      mkpath("$opt_vardir/log");
+    }
     mtr_kill_leftovers();
    }
 }
@@ -2416,9 +2423,9 @@ sub initialize_servers () {
 
   if ( ! $glob_use_running_server )
   {
-    kill_running_server();
+    kill_running_servers();
 
-    unless ( $opt_start_dirty )
+    if ( ! $opt_start_dirty )
     {
       cleanup_stale_files();
       mysql_install_db();
@@ -3782,7 +3789,7 @@ sub run_testcase_stop_servers($$$) {
 #
 # run_testcase_start_servers
 #
-# Start the servers neede by this test case
+# Start the servers needed by this test case
 #
 # RETURN
 #  0 OK

sql-common/client.c

@@ -2369,6 +2369,8 @@ my_bool mysql_reconnect(MYSQL *mysql)
 {
   MYSQL tmp_mysql;
   DBUG_ENTER("mysql_reconnect");
+  DBUG_ASSERT(mysql);
+  DBUG_PRINT("enter", ("mysql->reconnect: %d", mysql->reconnect));
 
   if (!mysql->reconnect ||
       (mysql->server_status & SERVER_STATUS_IN_TRANS) || !mysql->host_info)