Commit 4779978b authored by unknown's avatar unknown
Browse files

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

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
parents c5cebf20 7405e779

client/mysqltest.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}

mysql-test/mysql-test-run.pl

+4 −3
Original line number Diff line number Diff line
@@ -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");

  }

}