diff options
| author | guilhem@mysql.com <> | 2004-08-19 23:24:35 +0200 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2004-08-19 23:24:35 +0200 |
| commit | 0db5b4d2029ccb1581c24cd22ad8305b9506719c (patch) | |
| tree | f548909409bba85fd158b49957ffbcc137481b69 /sql/log.cc | |
| parent | 2d7f4c30a738b089da6676a12f50b7c88fa7c2b3 (diff) | |
| download | mariadb-git-0db5b4d2029ccb1581c24cd22ad8305b9506719c.tar.gz | |
(manual port from 4.0 - was needed)
Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc index ac412f2de9a..bcac7267f8b 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1877,6 +1877,20 @@ void MYSQL_LOG::set_max_size(ulong max_size_arg) } +Disable_binlog::Disable_binlog(THD *thd_arg) : + thd(thd_arg), + save_options(thd_arg->options) +{ + thd_arg->options&= ~OPTION_BIN_LOG; +}; + + +Disable_binlog::~Disable_binlog() +{ + thd->options= save_options; +} + + /* Check if a string is a valid number |