diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-09-24 08:46:43 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-09-24 08:46:43 +0200 |
| commit | bf1d4487fb5cce46ce3ceeb3d3fab005bba4036f (patch) | |
| tree | 4bcb5f0af19f57b815b5e6fae8942c6093aa81b9 /sql/log.cc | |
| parent | 6b8032ed4f8dc03c22f4fd0f168a6eed26d68846 (diff) | |
| parent | 04b3b7c1a6cb88b8f4bf97f5647d195b70602d1a (diff) | |
| download | mariadb-git-bf1d4487fb5cce46ce3ceeb3d3fab005bba4036f.tar.gz | |
Merge from mysql-5.5-bugfixing to mysql-5.5-runtime.
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/log.cc b/sql/log.cc index 88352706318..8cf5dd9ae65 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -5284,11 +5284,8 @@ int MYSQL_BIN_LOG::wait_for_update_bin_log(THD* thd, const struct timespec *timeout) { int ret= 0; - const char* old_msg = thd->proc_info; DBUG_ENTER("wait_for_update_bin_log"); - old_msg= thd->enter_cond(&update_cond, &LOCK_log, - "Master has sent all binlog to slave; " - "waiting for binlog to be updated"); + if (!timeout) mysql_cond_wait(&update_cond, &LOCK_log); else |