database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

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

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown
2006-10-12 13:51:54 +02:00
parent c5cebf205f 7405e7792d
commit 4779978bdc
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysqltest.c
View File

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

7
mysql-test/mysql-test-run.pl
View File

@@ -1417,13 +1417,14 @@ sub executable_setup () {
if ( $glob_use_embedded_server ) if ( $glob_use_embedded_server )
{ {
$exe_mysql_client_test= $exe_mysql_client_test=
mtr_exe_exists("$glob_basedir/libmysqld/examples/mysql_client_test_embedded", mtr_exe_exists("$glob_basedir/libmysqld/examples/mysql_client_test_embedded");
"$path_client_bindir/mysql_client_test_embedded");
} }
else else
{ {
$exe_mysql_client_test= $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");
} }
} }