diff options
| author | unknown <monty@narttu.mysql.fi> | 2000-11-27 02:44:41 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2000-11-27 02:44:41 +0200 |
| commit | 2700d28319bf29ee3957a357eaa102bcc72e1ac4 (patch) | |
| tree | 8a737a53b89e213741053e2d7b14013c4f8609a3 /sql/slave.cc | |
| parent | d164cbf20770565dc8674e5266beb2a8d88f748a (diff) | |
| parent | 1b337e01d5d0a97b3a66eb98bcad658cfecb65b6 (diff) | |
| download | mariadb-git-2700d28319bf29ee3957a357eaa102bcc72e1ac4.tar.gz | |
merge
sql/slave.cc:
Auto merged
Docs/manual.texi:
Merge
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index a5a15e8c30e..f2636ab5380 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -560,8 +560,7 @@ static int init_slave_thread(THD* thd) thd->master_access= ~0; thd->priv_user = 0; thd->slave_thread = 1; - thd->options = (((opt_log_slave_updates) ? OPTION_BIN_LOG:0) - | OPTION_AUTO_COMMIT | OPTION_AUTO_IS_NULL) ; + thd->options = (((opt_log_slave_updates) ? OPTION_BIN_LOG:0) | OPTION_AUTO_IS_NULL) ; thd->system_thread = 1; thd->client_capabilities = CLIENT_LOCAL_FILES; slave_real_id=thd->real_id=pthread_self(); |