diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-17 10:18:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-17 10:18:17 +0200 |
| commit | df5f25fa7a2c9f43f0506b2ef98dc00033a5c557 (patch) | |
| tree | a817540a283821a9badd4e704ca79b7c57d1d1e0 /sql/slave.cc | |
| parent | b036b6b59464524d7dd54a4c9a75b5ee8a14dbe0 (diff) | |
| parent | 1da916c37e5107b27297fc9e22c3da7772bb097d (diff) | |
| download | mariadb-git-df5f25fa7a2c9f43f0506b2ef98dc00033a5c557.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 3a03464ccf9..dc499fb1fc2 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2341,7 +2341,6 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type) thd->enable_slow_log= opt_log_slow_slave_statements; thd->variables.log_slow_filter= global_system_variables.log_slow_filter; set_slave_thread_options(thd); - thd->client_capabilities = CLIENT_LOCAL_FILES; mysql_mutex_lock(&LOCK_thread_count); thd->thread_id= thd->variables.pseudo_thread_id= thread_id++; mysql_mutex_unlock(&LOCK_thread_count); |