summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authormonty@mysql.com/narttu.mysql.fi <>2007-04-17 14:41:16 +0300
committermonty@mysql.com/narttu.mysql.fi <>2007-04-17 14:41:16 +0300
commit0a35bd923f3a2336cefad7a62e768c836271c585 (patch)
treea41e99e7343f5bdd8970e3a1f9bfd6d769a20bc3 /client/mysqltest.c
parent72d135bec59d7556736800bf3f9d268897e2832d (diff)
downloadmariadb-git-0a35bd923f3a2336cefad7a62e768c836271c585.tar.gz
Fixed federated and some replication tests to not stop slave until it's up and running.
(Removes some warnings about UNIX_TIMESTAMP from the slave.err logs) Marked federated_server as a '--big-test' Change error in net_clear to 'Note', as it interfered with mysql-test-run.
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 8b5c657f75f..360409e9611 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -2552,6 +2552,7 @@ int do_save_master_pos()
MYSQL *mysql = &cur_con->mysql;
const char *query;
int rpl_parse;
+ DBUG_ENTER("do_save_master_pos");
rpl_parse = mysql_rpl_parse_enabled(mysql);
mysql_disable_rpl_parse(mysql);
@@ -2709,7 +2710,7 @@ int do_save_master_pos()
if (rpl_parse)
mysql_enable_rpl_parse(mysql);
- return 0;
+ DBUG_RETURN(0);
}
@@ -3164,7 +3165,7 @@ struct st_connection * find_connection_by_name(const char *name)
int select_connection_name(const char *name)
{
- DBUG_ENTER("select_connection2");
+ DBUG_ENTER("select_connection_name");
DBUG_PRINT("enter",("name: '%s'", name));
if (!(cur_con= find_connection_by_name(name)))
@@ -3187,7 +3188,7 @@ int select_connection(struct st_command *command)
if (*p)
*p++= 0;
command->last_argument= p;
- return select_connection_name(name);
+ DBUG_RETURN(select_connection_name(name));
}