summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl_heap.test
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2004-08-19 23:24:35 +0200
committerunknown <guilhem@mysql.com>2004-08-19 23:24:35 +0200
commite7157aba3ab883135d32c285c70b4c326f44f870 (patch)
treef548909409bba85fd158b49957ffbcc137481b69 /mysql-test/t/rpl_heap.test
parent0ed563e80180a848dbd8a3d062663ce14b479e11 (diff)
downloadmariadb-git-e7157aba3ab883135d32c285c70b4c326f44f870.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(). mysql-test/r/rpl_heap.result: result update mysql-test/t/rpl_heap.test: changing test to test a bug (but anyway, mysql-test-run --manager looks like not working in 4.1 currently, so this test is never run). 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 not 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 arg from mysql_create_table() 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).
Diffstat (limited to 'mysql-test/t/rpl_heap.test')
-rw-r--r--mysql-test/t/rpl_heap.test6
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/t/rpl_heap.test b/mysql-test/t/rpl_heap.test
index 15f61918034..0bc71eaf30c 100644
--- a/mysql-test/t/rpl_heap.test
+++ b/mysql-test/t/rpl_heap.test
@@ -13,8 +13,10 @@ connect (slave,localhost,root,,test,0,slave.sock);
connection master;
reset master;
drop table if exists t1;
-create table t1 (a int) type=HEAP;
-insert into t1 values(10);
+# we use CREATE SELECT to verify that DELETE does not get into binlog
+# before CREATE SELECT
+create table t1 type=HEAP select 10 as a;
+insert into t1 values(11);
save_master_pos;
show binlog events from 79;
connection slave;