From 7335c6f2a4319f431f22b79f664881ca265026b0 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Fri, 24 Jan 2014 14:30:19 +0200 Subject: [PATCH] Fixed failures in tokudb test cases storage/tokudb/mysql-test/tokudb_bugs/r/5733_innodb.result: Speed up test storage/tokudb/mysql-test/tokudb_bugs/r/5733_tokudb.result: Speed up test Fix results storage/tokudb/mysql-test/tokudb_bugs/r/xa-6.result: Ensure that mysql.proc is properly closed storage/tokudb/mysql-test/tokudb_bugs/t/5733_innodb.test: Speed up test storage/tokudb/mysql-test/tokudb_bugs/t/5733_tokudb.test: Speed up test Accept both index and range scan for one query storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test: Ensure that mysql.proc is properly closed --- storage/tokudb/mysql-test/tokudb_bugs/r/5733_innodb.result | 2 ++ storage/tokudb/mysql-test/tokudb_bugs/r/5733_tokudb.result | 4 +++- storage/tokudb/mysql-test/tokudb_bugs/r/xa-6.result | 1 + storage/tokudb/mysql-test/tokudb_bugs/t/5733_innodb.test | 2 ++ storage/tokudb/mysql-test/tokudb_bugs/t/5733_tokudb.test | 4 ++++ storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test | 3 +++ 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/5733_innodb.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5733_innodb.result index 10cdb4767f6..c850de928b9 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/5733_innodb.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5733_innodb.result @@ -1,6 +1,7 @@ drop table if exists t; set default_storage_engine='innodb'; create table t (id bigint primary key, x bigint not null); +begin; insert into t values (0,0); insert into t values (1,0); insert into t values (2,0); @@ -10001,6 +10002,7 @@ insert into t values (9996,0); insert into t values (9997,0); insert into t values (9998,0); insert into t values (9999,0); +commit; explain select id from t where id>0 limit 10; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t range PRIMARY PRIMARY 8 NULL # Using where; Using index diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/5733_tokudb.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5733_tokudb.result index b642c8d6963..07e8b37c263 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/5733_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5733_tokudb.result @@ -1,6 +1,7 @@ drop table if exists t; set default_storage_engine='tokudb'; create table t (id bigint primary key, x bigint not null); +begin; insert into t values (0,0); insert into t values (1,0); insert into t values (2,0); @@ -10001,9 +10002,10 @@ insert into t values (9996,0); insert into t values (9997,0); insert into t values (9998,0); insert into t values (9999,0); +commit; explain select id from t where id>0 limit 10; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t range PRIMARY PRIMARY 8 NULL # Using where; Using index +1 SIMPLE t index_or_range PRIMARY PRIMARY 8 NULL # Using where; Using index_or_range explain select * from t where id>0 limit 10; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t range PRIMARY PRIMARY 8 NULL # Using where diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/xa-6.result b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-6.result index 955d7a6212a..904a25f6424 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/xa-6.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-6.result @@ -1,4 +1,5 @@ drop table if exists t1; +FLUSH TABLES; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=tokudb; xa begin 'a','ab'; insert into t1 values (1); diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/5733_innodb.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5733_innodb.test index dec1f39eb97..d629c2cfe1c 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/5733_innodb.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5733_innodb.test @@ -11,12 +11,14 @@ set default_storage_engine='innodb'; create table t (id bigint primary key, x bigint not null); +begin; let $i=0; let $n=10000; while ($i < $n) { eval insert into t values ($i,0); inc $i; } +commit; replace_column 9 #; explain select id from t where id>0 limit 10; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/5733_tokudb.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5733_tokudb.test index e0e0fc886fd..2e30c839905 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/5733_tokudb.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5733_tokudb.test @@ -11,14 +11,18 @@ set default_storage_engine='tokudb'; create table t (id bigint primary key, x bigint not null); +begin; let $i=0; let $n=10000; while ($i < $n) { eval insert into t values ($i,0); inc $i; } +commit; +# TokuDB may do index or range scan on this. Both are ok replace_column 9 #; +--replace_result index index_or_range range index_or_range explain select id from t where id>0 limit 10; replace_column 9 #; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test index ce3ad5e326b..cb16357ff11 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test @@ -5,6 +5,9 @@ drop table if exists t1; --enable_warnings +# Ensure that all tables are properly closed before we start simulating +# crashes +FLUSH TABLES; # test that simple xa commands work with TokuDB CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=tokudb;