diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-28 21:41:10 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-28 21:41:10 +0200 |
| commit | 0374dcdd9557002cc6e9747b28a4d01c9259ca6c (patch) | |
| tree | 139475fd16658189e77529627fb94bbba4b777f1 /sql/sql_repl.cc | |
| parent | 184e24b2253a81b03476e3d4d8cf56d5eb9dbf18 (diff) | |
| parent | 12fd55a5a65dd3d6e6f1ba883d20a86a74aa8d2d (diff) | |
| download | mariadb-git-0374dcdd9557002cc6e9747b28a4d01c9259ca6c.tar.gz | |
merge
myisam/mi_check.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 590d25e3661..7730706f0d0 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -391,7 +391,7 @@ sweepstakes if you report the bug"; thd->mysys_var->current_mutex = log_lock; thd->mysys_var->current_cond = &COND_binlog_update; const char* proc_info = thd->proc_info; - thd->proc_info = "Waiting for update"; + thd->proc_info = "Slave connection: waiting for binlog update"; pthread_mutex_unlock(&thd->mysys_var->mutex); bool read_packet = 0, fatal_error = 0; |