1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 5.5-bug58195 -> 5.5-mtr

Browse Source
This commit is contained in:
Magnus Blåudd 2010-11-15 12:47:05 +01:00
commit 49ce7daa94
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysqltest.cc
View File

@ -4243,7 +4243,7 @@ int do_save_master_pos()
const char latest_applied_binlog_epoch_str[]= const char latest_applied_binlog_epoch_str[]=
"latest_applied_binlog_epoch="; "latest_applied_binlog_epoch=";
if (count) if (count)
sleep(1); my_sleep(100*1000); /* 100ms */
if (mysql_query(mysql, query= "show engine ndb status")) if (mysql_query(mysql, query= "show engine ndb status"))
die("failed in '%s': %d %s", query, die("failed in '%s': %d %s", query,
mysql_errno(mysql), mysql_error(mysql)); mysql_errno(mysql), mysql_error(mysql));
@ -4332,7 +4332,7 @@ int do_save_master_pos()
count++; count++;
if (latest_handled_binlog_epoch >= start_epoch) if (latest_handled_binlog_epoch >= start_epoch)
do_continue= 0; do_continue= 0;
else if (count > 30) else if (count > 300) /* 30s */
{ {
break; break;
} }