database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca

Browse Source 
into  gbichot4.local:/home/mysql_src/mysql-maria-monty


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/replace.c:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
include/my_global.h:
  merge
storage/myisam/myisamdef.h:
  merge
This commit is contained in:
unknown
2008-02-18 23:35:17 +01:00
parent d37d49bc54 85213f6235
commit 34fff04d03
28 changed files with 82 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/mysql_client_test.c
View File

@ -16862,16 +16862,16 @@ static void bug20023_change_user(MYSQL *con)
opt_db ? opt_db : "test"));
}
static bool query_int_variable(MYSQL *con,
const char *var_name,
int *var_value)
static my_bool query_int_variable(MYSQL *con,
const char *var_name,
int *var_value)
{
MYSQL_RES *rs;
MYSQL_ROW row;
char query_buffer[MAX_TEST_QUERY_LENGTH];
bool is_null;
my_bool is_null;
my_snprintf(query_buffer,
sizeof (query_buffer),
@ -17050,7 +17050,7 @@ static void bug31418_impl()
{
MYSQL con;
bool is_null;
my_bool is_null;
int rc;
/* Create a new connection. */