diff options
| author | unknown <sergefp@mysql.com> | 2005-10-19 01:52:06 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-10-19 01:52:06 +0400 |
| commit | 8698ffc9681f1e4efd6deb0e89bb803793cafb04 (patch) | |
| tree | febbf43acba837f32d47827ceeddb248142fb95a /sql/slave.cc | |
| parent | 723b28a25cfe81846ef88a87bbffc3144f14b1d6 (diff) | |
| parent | 7d81acb5e91b0e94b169bfb0a09f430f28496d59 (diff) | |
| download | mariadb-git-8698ffc9681f1e4efd6deb0e89bb803793cafb04.tar.gz | |
BUG#121915: Merge 4.1->5.0
mysql-test/r/update.result:
Auto merged
mysql-test/t/update.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/records.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/structs.h:
Auto merged
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 603ba8a8155..f785bdcd4d7 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2869,7 +2869,6 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type) thd->system_thread = (thd_type == SLAVE_THD_SQL) ? SYSTEM_THREAD_SLAVE_SQL : SYSTEM_THREAD_SLAVE_IO; thd->security_ctx->skip_grants(); - thd->client_capabilities = 0; my_net_init(&thd->net, 0); thd->net.read_timeout = slave_net_timeout; thd->slave_thread = 1; |