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().


mysql-test/r/rpl_heap.result:
  result update
mysql-test/t/rpl_heap.test:
  testing a bug
sql/log.cc:
  new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/mysql_priv.h:
  removing argument no_log from mysql_create_table(); no_log was perfect as some
  binlogging could still be done by open_unireg_entry() for a HEAP table.
sql/sql_class.h:
  new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/sql_parse.cc:
  removing no_log
sql/sql_table.cc:
  removing no_log from mysql_create_table(); instead using new class Disable_binlog.
  Disabling binlogging in some cases, where the binlogging is done later by some other code
  (case of CREATE SELECT and ALTER).

1 files changed, 16 insertions, 0 deletions

diff --git a/sql/log.cc b/sql/log.cc
index e031656cc6e..2956efc047f 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1627,6 +1627,22 @@ 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), save_master_access(thd_arg->master_access)
+{
+  thd_arg->options&= ~OPTION_BIN_LOG;
+  thd_arg->master_access|= SUPER_ACL; // unneeded in 4.1
+};
+
+
+Disable_binlog::~Disable_binlog()
+{
+  thd->options= save_options;
+  thd->master_access= save_master_access;
+}
+
+
 /*
   Check if a string is a valid number