Skip to content

M
mariadb
Commit 5e334812 authored by Rich Prohaska's avatar Rich Prohaska
Browse files
Options

refs #5545 make mysql add index tests run on 5.5 and 5.6 

git-svn-id: file:///svn/mysql/tests/mysql-test@48524 c7de825b-a66e-492c-adef-691d508d4ae1
parent 2736f574
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 57 deletions
mysql-test/suite/tokudb.add_index/r/1522.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
DROP TABLE IF EXISTS t1;
create table t1 (a int, b int) engine=tokudb;
insert into t1 values (1,1),(1,2),(2,1),(2,2);
......
mysql-test/suite/tokudb.add_index/r/add_index_1.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, str varchar(3), b int, c int, z int, y int, x int, r int, s int, t int, d char(4), primary key (a,b), key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_10.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_11.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, str varchar(3), b int, c int, z int, y int, x int, r int, s int, t int, d char(4), key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_12.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int,key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_13.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, str varchar(3), b int, c int, z int, y int, x int, r int, s int, t int, d char(4), key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_14.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_15.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_16.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_17.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_18.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_2.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, primary key (a,b), key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_3.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, str varchar(3), b int, c int, z int, y int, x int, r int, s int, t int, d char(4), primary key (a,b), key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_4.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, primary key (a,b), key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_5.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, primary key (a,b), key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_6.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, primary key (a,b), key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_7.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, primary key (a,b), key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_8.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, primary key (a,b), key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/add_index_9.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
*** Bug #22169 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, primary key (a,b), key (z), key(x), key(t));
......
mysql-test/suite/tokudb.add_index/r/falcon_bug_22516.result
View file @ 5e334812
......@@ -18,7 +18,7 @@ select count(*) from t1 where sca_pic >= 'n';
count(*)
1
alter table t1 drop index sca_pic, add index (sca_pic, cat_code);
ERROR 42000: Table 't1' uses an extension that doesn't exist in this MySQL version
ERROR 42000: Table 't1' uses an extension that doesn't exist in this XYZ version
select count(*) from t1 where sca_pic >= 'n';
count(*)
1
......@@ -48,7 +48,7 @@ select count(*) from t1 where sca_pic is null;
count(*)
2
alter table t1 drop index sca_pic, add index sca_pic (cat_code, sca_pic);
ERROR 42000: Table 't1' uses an extension that doesn't exist in this MySQL version
ERROR 42000: Table 't1' uses an extension that doesn't exist in this XYZ version
select count(*) from t1 where sca_code='PD' and sca_pic is null;
count(*)
1
......@@ -56,7 +56,7 @@ select count(*) from t1 where cat_code='E';
count(*)
0
alter table t1 drop index sca_pic, add index (sca_pic, cat_code);
ERROR 42000: Table 't1' uses an extension that doesn't exist in this MySQL version
ERROR 42000: Table 't1' uses an extension that doesn't exist in this XYZ version
select count(*) from t1 where sca_code='PD' and sca_pic is null;
count(*)
1
......
mysql-test/suite/tokudb.add_index/r/falcon_bug_23691.result
View file @ 5e334812
SET STORAGE_ENGINE = tokudb;
SET DEFAULT_STORAGE_ENGINE = tokudb;
*** Bug #23691 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a char(5));
......
mysql-test/suite/tokudb.add_index/r/falcon_bug_23692.result
View file @ 5e334812
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
*** Bug #23692 ***
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
......
mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_1.result
View file @ 5e334812
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
*** Bug #23818_I ***
DROP TABLE IF EXISTS t1;
DROP PROCEDURE IF EXISTS p1;
......
mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_2.result
View file @ 5e334812
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
*** Bug #23818_II ***
DROP TABLE IF EXISTS t1;
DROP PROCEDURE IF EXISTS p1;
......
mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_A.result
View file @ 5e334812
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
*** Bug #23818_A ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b varchar(1100));
......
mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_B.result
View file @ 5e334812
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
*** Bug #23818_B ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b varchar(1100));
......
mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_C.result
View file @ 5e334812
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
*** Bug #23818_C ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b varchar(1100));
......
mysql-test/suite/tokudb.add_index/r/tokudb_bug_1152.result
View file @ 5e334812
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a1 int,a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int) engine = tokudb;
insert into t1 (a9,a10) values (1,2);
......
mysql-test/suite/tokudb.add_index/t/1522.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
--disable_warnings
DROP TABLE IF EXISTS t1;
......
mysql-test/suite/tokudb.add_index/t/add_index_1.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_10.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_11.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_12.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_13.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_14.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_15.test
View file @ 5e334812
--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_16.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_17.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_18.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_2.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_3.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_4.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_5.test
View file @ 5e334812
--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_6.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_7.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_8.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/add_index_9.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
#
# Bug #22169: Crash with count(distinct)
#
......
mysql-test/suite/tokudb.add_index/t/falcon_bug_22516.test
View file @ 5e334812
......@@ -31,6 +31,7 @@ INSERT INTO t1 ( sca_code, cat_code, lan_code, sca_pic, sca_sdesc, sca_sch_desc)
alter table t1 add index sca_pic (cat_code, sca_pic);
select count(*) from t1 where sca_pic >= 'n';
--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
alter table t1 drop index sca_pic, add index (sca_pic, cat_code);
# alter table t1 drop index sca_pic;
# alter table t1 add index (sca_pic, cat_code);
......@@ -60,10 +61,12 @@ INSERT INTO t1 ( sca_code, cat_code, sca_desc, lan_code, sca_pic, sca_sdesc, sca
select count(*) from t1 where sca_code = 'PD';
select count(*) from t1 where sca_code <= 'PD';
select count(*) from t1 where sca_pic is null;
--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
alter table t1 drop index sca_pic, add index sca_pic (cat_code, sca_pic);
select count(*) from t1 where sca_code='PD' and sca_pic is null;
select count(*) from t1 where cat_code='E';
--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
alter table t1 drop index sca_pic, add index (sca_pic, cat_code);
select count(*) from t1 where sca_code='PD' and sca_pic is null;
select count(*) from t1 where sca_pic >= 'n';
......
mysql-test/suite/tokudb.add_index/t/falcon_bug_23691.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE = tokudb;
SET DEFAULT_STORAGE_ENGINE = tokudb;
#
# Bug #23691: Falcon: searches fail if partial index
#
......
mysql-test/suite/tokudb.add_index/t/falcon_bug_23692.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
#
# Bug #23692: Falcon: searches fail if data is 0x00
#
......
mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_1.test
View file @ 5e334812
--source include/have_tokudb.inc
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
#
# Bug #23818 Falcon: crash with random updates of long varchar columns
# First part. Original bug reports loops 100000 times.
......
mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_2.test
View file @ 5e334812
--source include/have_tokudb.inc
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
#
# Bug #23818 Falcon: crash with random updates of long varchar columns
# Second part. Original bug reports loops 100000 times.
......
mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_A.test
View file @ 5e334812
--source include/have_tokudb.inc
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
#
# Bug #23818 Falcon: crash with random updates of long varchar columns
# First part. Original bug reports loops 100000 times.
......
mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_B.test
View file @ 5e334812
--source include/have_tokudb.inc
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
#
# Bug #23818 Falcon: crash with random updates of long varchar columns
# First part. Original bug reports loops 100000 times.
......
mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_C.test
View file @ 5e334812
--source include/have_tokudb.inc
SET @@STORAGE_ENGINE = tokudb;
SET @@DEFAULT_STORAGE_ENGINE = tokudb;
#
# Bug #23818 Falcon: crash with random updates of long varchar columns
# First part. Original bug reports loops 100000 times.
......
mysql-test/suite/tokudb.add_index/t/tokudb_bug_1152.test
View file @ 5e334812
#--source include/have_tokudb.inc
SET STORAGE_ENGINE='tokudb';
SET DEFAULT_STORAGE_ENGINE='tokudb';
--disable_warnings
DROP TABLE IF EXISTS t1;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7