Commit 7335c6f2 authored by Michael Widenius's avatar Michael Widenius

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
parent 5a7ae593
drop table if exists t; drop table if exists t;
set default_storage_engine='innodb'; set default_storage_engine='innodb';
create table t (id bigint primary key, x bigint not null); create table t (id bigint primary key, x bigint not null);
begin;
insert into t values (0,0); insert into t values (0,0);
insert into t values (1,0); insert into t values (1,0);
insert into t values (2,0); insert into t values (2,0);
...@@ -10001,6 +10002,7 @@ insert into t values (9996,0); ...@@ -10001,6 +10002,7 @@ insert into t values (9996,0);
insert into t values (9997,0); insert into t values (9997,0);
insert into t values (9998,0); insert into t values (9998,0);
insert into t values (9999,0); insert into t values (9999,0);
commit;
explain select id from t where id>0 limit 10; explain select id from t where id>0 limit 10;
id select_type table type possible_keys key key_len ref rows Extra 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 range PRIMARY PRIMARY 8 NULL # Using where; Using index
......
drop table if exists t; drop table if exists t;
set default_storage_engine='tokudb'; set default_storage_engine='tokudb';
create table t (id bigint primary key, x bigint not null); create table t (id bigint primary key, x bigint not null);
begin;
insert into t values (0,0); insert into t values (0,0);
insert into t values (1,0); insert into t values (1,0);
insert into t values (2,0); insert into t values (2,0);
...@@ -10001,9 +10002,10 @@ insert into t values (9996,0); ...@@ -10001,9 +10002,10 @@ insert into t values (9996,0);
insert into t values (9997,0); insert into t values (9997,0);
insert into t values (9998,0); insert into t values (9998,0);
insert into t values (9999,0); insert into t values (9999,0);
commit;
explain select id from t where id>0 limit 10; explain select id from t where id>0 limit 10;
id select_type table type possible_keys key key_len ref rows Extra 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; explain select * from t where id>0 limit 10;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t range PRIMARY PRIMARY 8 NULL # Using where 1 SIMPLE t range PRIMARY PRIMARY 8 NULL # Using where
......
drop table if exists t1; drop table if exists t1;
FLUSH TABLES;
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=tokudb; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=tokudb;
xa begin 'a','ab'; xa begin 'a','ab';
insert into t1 values (1); insert into t1 values (1);
......
...@@ -11,12 +11,14 @@ set default_storage_engine='innodb'; ...@@ -11,12 +11,14 @@ set default_storage_engine='innodb';
create table t (id bigint primary key, x bigint not null); create table t (id bigint primary key, x bigint not null);
begin;
let $i=0; let $i=0;
let $n=10000; let $n=10000;
while ($i < $n) { while ($i < $n) {
eval insert into t values ($i,0); eval insert into t values ($i,0);
inc $i; inc $i;
} }
commit;
replace_column 9 #; replace_column 9 #;
explain select id from t where id>0 limit 10; explain select id from t where id>0 limit 10;
......
...@@ -11,14 +11,18 @@ set default_storage_engine='tokudb'; ...@@ -11,14 +11,18 @@ set default_storage_engine='tokudb';
create table t (id bigint primary key, x bigint not null); create table t (id bigint primary key, x bigint not null);
begin;
let $i=0; let $i=0;
let $n=10000; let $n=10000;
while ($i < $n) { while ($i < $n) {
eval insert into t values ($i,0); eval insert into t values ($i,0);
inc $i; inc $i;
} }
commit;
# TokuDB may do index or range scan on this. Both are ok
replace_column 9 #; replace_column 9 #;
--replace_result index index_or_range range index_or_range
explain select id from t where id>0 limit 10; explain select id from t where id>0 limit 10;
replace_column 9 #; replace_column 9 #;
......
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
drop table if exists t1; drop table if exists t1;
--enable_warnings --enable_warnings
# Ensure that all tables are properly closed before we start simulating
# crashes
FLUSH TABLES;
# test that simple xa commands work with TokuDB # test that simple xa commands work with TokuDB
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=tokudb; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=tokudb;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment