mirror of
https://github.com/MariaDB/server.git
synced 2026-04-19 23:05:32 +02:00
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
This commit is contained in:
commit
0374dcdd95
33 changed files with 375 additions and 82 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue