diff options
| author | pem@mysql.com <> | 2003-08-26 11:51:09 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-08-26 11:51:09 +0200 |
| commit | 7f158dd12a814e990454eee85fc5fea4d18a8d30 (patch) | |
| tree | 64a6fa388e4aab5527ee4bc81489d6cfac07fcf0 /sql/sql_repl.h | |
| parent | 5b28d4a9a49a2d1c3225044b2cc82aa9e840687f (diff) | |
| parent | 6f6042462933c66f8af0503b32aa62e43f1aaf1f (diff) | |
| download | mariadb-git-7f158dd12a814e990454eee85fc5fea4d18a8d30.tar.gz | |
Merge 4.1 into 5.0
Diffstat (limited to 'sql/sql_repl.h')
| -rw-r--r-- | sql/sql_repl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_repl.h b/sql/sql_repl.h index fe1b7167d4a..2ff38029b7b 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -20,7 +20,7 @@ extern I_List<i_string> binlog_do_db, binlog_ignore_db; extern int max_binlog_dump_events; extern my_bool opt_sporadic_binlog_dump_fail; -#define KICK_SLAVE(thd) { pthread_mutex_lock(&(thd)->LOCK_delete); (thd)->awake(0 /* do not prepare to die*/); pthread_mutex_unlock(&(thd)->LOCK_delete); } +#define KICK_SLAVE(thd) { pthread_mutex_lock(&(thd)->LOCK_delete); (thd)->awake(THD::NOT_KILLED); pthread_mutex_unlock(&(thd)->LOCK_delete); } File open_binlog(IO_CACHE *log, const char *log_file_name, const char **errmsg); |