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 work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

Browse Source 
client/mysqltest.c:
  Auto merged
This commit is contained in:
unknown
2002-05-22 19:11:51 +03:00
parent 6a97c5912f c8e93fd787
commit 473aa13d6b
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/mysqltest.c
View File

@ -664,7 +664,7 @@ int open_file(const char* name)
}
/* ugly long name, but we are following the convention */
int do_wait_for_slave_to_stop(struct st_query* __attribute__((unused)) q)
int do_wait_for_slave_to_stop(struct st_query* q __attribute__((unused)))
{
MYSQL* mysql = &cur_con->mysql;
#ifndef OS2
@ -702,7 +702,7 @@ int do_wait_for_slave_to_stop(struct st_query* __attribute__((unused)) q)
return 0;
}
int do_require_manager(struct st_query* __attribute__((unused)) q)
int do_require_manager(struct st_query* a __attribute__((unused)))
{
if (!manager)
abort_not_supported_test();
@ -1025,20 +1025,20 @@ int do_let(struct st_query* q)
return var_set(var_name, var_name_end, var_val_start, q->end);
}
int do_rpl_probe(struct st_query* __attribute__((unused)) q)
int do_rpl_probe(struct st_query* q __attribute__((unused)))
{
if(mysql_rpl_probe(&cur_con->mysql))
die("Failed in mysql_rpl_probe(): %s", mysql_error(&cur_con->mysql));
return 0;
}
int do_enable_rpl_parse(struct st_query* __attribute__((unused)) q)
int do_enable_rpl_parse(struct st_query* q __attribute__((unused)))
{
mysql_enable_rpl_parse(&cur_con->mysql);
return 0;
}
int do_disable_rpl_parse(struct st_query* __attribute__((unused)) q)
int do_disable_rpl_parse(struct st_query* q __attribute__((unused)))
{
mysql_disable_rpl_parse(&cur_con->mysql);
return 0;