summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2017-10-19 09:06:17 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2017-10-19 09:06:17 +0300
commit8da6b4ef5260179b1577843517c46e4b95a9e911 (patch)
treef3194a3065a220aa37ff14ce478fa6eed72e5be6 /sql/slave.cc
parent2b811f0624c46469185ff4d93bd8f184e1f7ac92 (diff)
parentb000e169562697aa072600695d4f0c0412f94f4f (diff)
downloadmariadb-git-8da6b4ef5260179b1577843517c46e4b95a9e911.tar.gz
Merge tag 'mariadb-5.5.58' into 5.5-galera
Diffstat (limited to 'sql/slave.cc')
-rw-r--r--sql/slave.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index f043ea3c477..5f7c5ffdb84 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2344,7 +2344,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);