diff options
| author | Magnus Blåudd <magnus.blaudd@sun.com> | 2010-11-15 12:47:05 +0100 |
|---|---|---|
| committer | Magnus Blåudd <magnus.blaudd@sun.com> | 2010-11-15 12:47:05 +0100 |
| commit | 49ce7daa947bb156daf92cd101495cfe33993afa (patch) | |
| tree | 4f94e3b49b49c106b6fd731d3ee8092ce293fe5f | |
| parent | e012532ad973b195115c69d5bd15bac7e697df37 (diff) | |
| parent | a557a66145255da841ce3f4796ac52b9101aff0a (diff) | |
| download | mariadb-git-49ce7daa947bb156daf92cd101495cfe33993afa.tar.gz | |
Merge 5.5-bug58195 -> 5.5-mtr
| -rw-r--r-- | client/mysqltest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 5dc3576e759..219fd518555 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -4243,7 +4243,7 @@ int do_save_master_pos() const char latest_applied_binlog_epoch_str[]= "latest_applied_binlog_epoch="; if (count) - sleep(1); + my_sleep(100*1000); /* 100ms */ if (mysql_query(mysql, query= "show engine ndb status")) die("failed in '%s': %d %s", query, mysql_errno(mysql), mysql_error(mysql)); @@ -4332,7 +4332,7 @@ int do_save_master_pos() count++; if (latest_handled_binlog_epoch >= start_epoch) do_continue= 0; - else if (count > 30) + else if (count > 300) /* 30s */ { break; } |