summaryrefslogtreecommitdiff
path: root/mysql-test/extra
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/extra')
-rw-r--r--mysql-test/extra/binlog_tests/blackhole.test15
-rw-r--r--mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test3
2 files changed, 16 insertions, 2 deletions
diff --git a/mysql-test/extra/binlog_tests/blackhole.test b/mysql-test/extra/binlog_tests/blackhole.test
index 80f998359ba..9f842a9a4eb 100644
--- a/mysql-test/extra/binlog_tests/blackhole.test
+++ b/mysql-test/extra/binlog_tests/blackhole.test
@@ -125,6 +125,16 @@ source include/show_binlog_events.inc;
drop table t1,t2,t3;
#
+# BUG#27998 - mysqld crashed when executing INSERT DELAYED on a BLACKHOLE
+# table
+#
+CREATE TABLE t1(a INT) ENGINE=BLACKHOLE;
+INSERT DELAYED INTO t1 VALUES(1);
+DROP TABLE t1;
+
+# End of 4.1 tests
+
+#
#Bug#19717: DELETE Query Error on BLACKHOLE when using WHERE on column with UNIQUE INDEX
#
CREATE TABLE t1(a INT, b INT) ENGINE=BLACKHOLE;
@@ -139,7 +149,8 @@ ALTER TABLE t1 ADD PRIMARY KEY(a);
DELETE FROM t1 WHERE a=10;
DROP TABLE t1;
-# End of 4.1 tests
+# End of 5.0 tests
+
# Test that a transaction which is rolled back does not go into binlog
# and that a transaction which is committed does
@@ -156,4 +167,4 @@ set autocommit=1;
source include/show_binlog_events.inc;
drop table if exists t1;
-# End of 5.0 tests
+# End of 5.1 tests
diff --git a/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test b/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
index 34e01b7a675..a8a3e33b8cd 100644
--- a/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
+++ b/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
@@ -4,6 +4,9 @@
# Purpose: To test having extra columns on the slave.
##################################################
+# Some tests in here requre partitioning
+-- source include/have_partition.inc
+
########### Clean up ################
--disable_warnings
--disable_query_log