summaryrefslogtreecommitdiff
path: root/mysql-test/t/create_or_replace.test
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2014-03-23 18:39:10 +0200
committerMichael Widenius <monty@askmonty.org>2014-03-23 18:39:10 +0200
commit9aac54687286b979c9469326f501a4b23aa5e4a3 (patch)
treedc701d68c87d99f06c1ef348cdad92c6b42df0fa /mysql-test/t/create_or_replace.test
parent39e6083e35459c9c8b22d37aaa2b74545884c7b0 (diff)
downloadmariadb-git-9aac54687286b979c9469326f501a4b23aa5e4a3.tar.gz
MDEV-5930 Server crashes in thd_get_ha_data on CREATE OR REPLACE TABLE
mysql-test/r/create_or_replace.result: More tests for create or replace mysql-test/t/create_or_replace.test: More tests for create or replace sql/log.cc: Don't use binlog_hton if binlog is not enabmed sql/sql_base.cc: We have to call restart_trans_for_tables also if tables where not locked with LOCK TABLES. If not, we will get a crash in TokuDB sql/sql_insert.cc: Don't call binlog_reset_cache() if we don't have binary log open sql/sql_table.cc: Don't log to binary log if not open Better test if we where using create or replace ... select storage/tokudb/mysql-test/tokudb_mariadb/r/create_or_replace.result: More tests for create or replace storage/tokudb/mysql-test/tokudb_mariadb/t/create_or_replace.test: More tests for create or replace
Diffstat (limited to 'mysql-test/t/create_or_replace.test')
-rw-r--r--mysql-test/t/create_or_replace.test7
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/t/create_or_replace.test b/mysql-test/t/create_or_replace.test
index 91c6c69ff1b..384768a87d5 100644
--- a/mysql-test/t/create_or_replace.test
+++ b/mysql-test/t/create_or_replace.test
@@ -196,11 +196,14 @@ drop table t1;
create table t1 (i int) engine=InnoDB;
create table t3 (i int) engine=InnoDB;
insert into t3 values(1),(2),(3);
-lock table t1 write, t2 write, t3 write;
+create table t4 (i int) engine=InnoDB;
+insert into t4 values(1);
+lock table t1 write, t2 write, t3 write, t4 write;
create or replace table t1 (a int, i int) engine=innodb select t2.a,t3.i from t2,t3;
+select * from t4;
unlock tables;
select * from t1 order by a,i;
-drop table t1,t3;
+drop table t1,t3,t4;
--echo #
--echo # Test the meta data locks are freed properly