database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

MDEV-5930 Server crashes in thd_get_ha_data on CREATE OR REPLACE TABLE

Browse Source 
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
This commit is contained in:
Michael Widenius
2014-03-23 18:39:10 +02:00
committed by Michael Widenius
parent 39e6083e35
commit 9aac546872
8 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/create_or_replace.result
View File

@@ -231,8 +231,13 @@ 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;
i
1
unlock tables;
select * from t1 order by a,i;
a i
@@ -245,7 +250,7 @@ a i
3 1
3 2
3 3
drop table t1,t3;
drop table t1,t3,t4;
#
# Test the meta data locks are freed properly
#