diff options
author | Varun Gupta <varun.gupta@mariadb.com> | 2019-04-25 22:05:54 +0530 |
---|---|---|
committer | Varun Gupta <varun.gupta@mariadb.com> | 2019-04-25 22:05:54 +0530 |
commit | 87472974cde5885f22efe622fe6485200a00766d (patch) | |
tree | d9581d93f3a920aa8a0db808edb85e2cf57f6260 /storage/tokudb | |
parent | 6599cd985ecc6e70b1a879e25dceda85809c5b06 (diff) | |
download | mariadb-git-87472974cde5885f22efe622fe6485200a00766d.tar.gz |
Results updated for tokudb tests
Diffstat (limited to 'storage/tokudb')
29 files changed, 100 insertions, 1 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/r/card_add_drop.result b/storage/tokudb/mysql-test/tokudb/r/card_add_drop.result index fe87a8e2ed6..887ccd5f073 100644 --- a/storage/tokudb/mysql-test/tokudb/r/card_add_drop.result +++ b/storage/tokudb/mysql-test/tokudb/r/card_add_drop.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists tt; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table tt (a int, b int, c int, d int, key(a), key(b), key(c)); insert into tt values (0,0,0,0),(1,0,0,0),(2,0,1,0),(3,0,1,0); show indexes from tt; @@ -37,4 +39,5 @@ Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_par tt 1 a 1 a A 4 NULL NULL YES BTREE tt 1 c 1 c A 4 NULL NULL YES BTREE tt 1 d 1 d A 2 NULL NULL YES BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/r/card_add_index.result b/storage/tokudb/mysql-test/tokudb/r/card_add_index.result index c32b4522460..ab7c6e330f4 100644 --- a/storage/tokudb/mysql-test/tokudb/r/card_add_index.result +++ b/storage/tokudb/mysql-test/tokudb/r/card_add_index.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists tt; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table tt (a int, b int, c int, primary key(a)); insert into tt values (1,0,0),(2,0,0),(3,0,1),(4,0,1); show indexes from tt; @@ -46,4 +48,5 @@ Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_par tt 0 PRIMARY 1 a A 4 NULL NULL BTREE tt 1 b 1 b A 2 NULL NULL YES BTREE tt 1 c 1 c A 4 NULL NULL YES BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/r/card_drop_index.result b/storage/tokudb/mysql-test/tokudb/r/card_drop_index.result index ac2979ab057..f924c8cd12b 100644 --- a/storage/tokudb/mysql-test/tokudb/r/card_drop_index.result +++ b/storage/tokudb/mysql-test/tokudb/r/card_drop_index.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists tt; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table tt (a int, b int, c int, key(b), key(c), primary key(a)); insert into tt values (1,0,0),(2,0,0),(3,0,1),(4,0,1); show indexes from tt; @@ -29,4 +31,5 @@ flush tables; show indexes from tt; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment tt 0 PRIMARY 1 a A 4 NULL NULL BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/r/card_drop_index_2.result b/storage/tokudb/mysql-test/tokudb/r/card_drop_index_2.result index 2a65b6f0982..5980b5795d5 100644 --- a/storage/tokudb/mysql-test/tokudb/r/card_drop_index_2.result +++ b/storage/tokudb/mysql-test/tokudb/r/card_drop_index_2.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists tt; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table tt (a int, b int, c int, primary key(a), key(b), key(c)); insert into tt values (0, 0, 0), (0+1, 0, 0), (0+2, 0, 0), (0+3, 0, 0); insert into tt values (4, 4, 0), (4+1, 4, 0), (4+2, 4, 0), (4+3, 4, 0); @@ -156,4 +158,5 @@ flush tables; show indexes from tt; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment tt 0 PRIMARY 1 a A 500 NULL NULL BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/r/card_drop_pk.result b/storage/tokudb/mysql-test/tokudb/r/card_drop_pk.result index 1b562ad6ac9..c560defb1fb 100644 --- a/storage/tokudb/mysql-test/tokudb/r/card_drop_pk.result +++ b/storage/tokudb/mysql-test/tokudb/r/card_drop_pk.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists tt; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table tt (a int, b int, c int, key(b), key(c), primary key(a)); insert into tt values (1,0,0),(2,0,0),(3,0,1),(4,0,1); show indexes from tt; @@ -26,4 +28,5 @@ show indexes from tt; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment tt 1 b 1 b A 4 NULL NULL YES BTREE tt 1 c 1 c A 4 NULL NULL YES BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/r/card_pk_2.result b/storage/tokudb/mysql-test/tokudb/r/card_pk_2.result index a5434968b0d..b1c3e679bb8 100644 --- a/storage/tokudb/mysql-test/tokudb/r/card_pk_2.result +++ b/storage/tokudb/mysql-test/tokudb/r/card_pk_2.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists tt; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table tt (a int, b int, primary key(a,b)); insert into tt values (0,0),(0,1),(1,0),(1,1); show indexes from tt; @@ -19,4 +21,5 @@ show indexes from tt; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment tt 0 PRIMARY 1 a A 4 NULL NULL BTREE tt 0 PRIMARY 2 b A 4 NULL NULL BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/r/card_pk_sk.result b/storage/tokudb/mysql-test/tokudb/r/card_pk_sk.result index 6c6f72be4a6..2f527cbbed5 100644 --- a/storage/tokudb/mysql-test/tokudb/r/card_pk_sk.result +++ b/storage/tokudb/mysql-test/tokudb/r/card_pk_sk.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists tt; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table tt (a int, b int, primary key(a), key(b)); insert into tt values (4*0,4*0+1),(4*0+1,4*0+2),(4*0+2,4*0+3),(4*0+3,4*0+4); insert into tt values (4*1,4*1+1),(4*1+1,4*1+2),(4*1+2,4*1+3),(4*1+3,4*1+4); @@ -2037,4 +2039,5 @@ show indexes from tt; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment tt 0 PRIMARY 1 a A 4000 NULL NULL BTREE tt 1 b 1 b A 2 NULL NULL YES BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/r/card_sk.result b/storage/tokudb/mysql-test/tokudb/r/card_sk.result index 19b98092a7b..1956c846e03 100644 --- a/storage/tokudb/mysql-test/tokudb/r/card_sk.result +++ b/storage/tokudb/mysql-test/tokudb/r/card_sk.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists tt; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table tt (a int, b int, key(b)); insert into tt values (1,0),(2,1),(3,2),(4,3); insert into tt values (5,0),(6,1),(7,2),(8,3); @@ -17,4 +19,5 @@ flush tables; show indexes from tt; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment tt 1 b 1 b A 8 NULL NULL YES BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/r/card_sk_2.result b/storage/tokudb/mysql-test/tokudb/r/card_sk_2.result index 950fdaf7850..f0fcbac0e3a 100644 --- a/storage/tokudb/mysql-test/tokudb/r/card_sk_2.result +++ b/storage/tokudb/mysql-test/tokudb/r/card_sk_2.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists tt; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table tt (a int, b int, key(a,b)); insert into tt values (0,0),(0,1),(1,0),(1,1); show indexes from tt; @@ -19,4 +21,5 @@ show indexes from tt; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment tt 1 a 1 a A 4 NULL NULL YES BTREE tt 1 a 2 b A 4 NULL NULL YES BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/t/card_add_drop.test b/storage/tokudb/mysql-test/tokudb/t/card_add_drop.test index 8563bf28ad1..66b26f20123 100644 --- a/storage/tokudb/mysql-test/tokudb/t/card_add_drop.test +++ b/storage/tokudb/mysql-test/tokudb/t/card_add_drop.test @@ -7,6 +7,9 @@ disable_warnings; drop table if exists tt; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; + create table tt (a int, b int, c int, d int, key(a), key(b), key(c)); insert into tt values (0,0,0,0),(1,0,0,0),(2,0,1,0),(3,0,1,0); @@ -24,5 +27,6 @@ show indexes from tt; # test that cardinality is persistent flush tables; show indexes from tt; +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/t/card_add_index.test b/storage/tokudb/mysql-test/tokudb/t/card_add_index.test index 455dae55236..54f29fcf289 100644 --- a/storage/tokudb/mysql-test/tokudb/t/card_add_index.test +++ b/storage/tokudb/mysql-test/tokudb/t/card_add_index.test @@ -7,6 +7,9 @@ disable_warnings; drop table if exists tt; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; + create table tt (a int, b int, c int, primary key(a)); insert into tt values (1,0,0),(2,0,0),(3,0,1),(4,0,1); @@ -30,5 +33,6 @@ show indexes from tt; # test that cardinality is persistent flush tables; show indexes from tt; +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/t/card_drop_index.test b/storage/tokudb/mysql-test/tokudb/t/card_drop_index.test index b8e7d575dbd..a300f035519 100644 --- a/storage/tokudb/mysql-test/tokudb/t/card_drop_index.test +++ b/storage/tokudb/mysql-test/tokudb/t/card_drop_index.test @@ -7,6 +7,9 @@ disable_warnings; drop table if exists tt; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; + create table tt (a int, b int, c int, key(b), key(c), primary key(a)); insert into tt values (1,0,0),(2,0,0),(3,0,1),(4,0,1); @@ -26,5 +29,6 @@ show indexes from tt; # test that cardinality is persistent flush tables; show indexes from tt; +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/t/card_drop_index_2.test b/storage/tokudb/mysql-test/tokudb/t/card_drop_index_2.test index 88e0f6a413f..9e8b412760c 100644 --- a/storage/tokudb/mysql-test/tokudb/t/card_drop_index_2.test +++ b/storage/tokudb/mysql-test/tokudb/t/card_drop_index_2.test @@ -7,6 +7,9 @@ disable_warnings; drop table if exists tt; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; + create table tt (a int, b int, c int, primary key(a), key(b), key(c)); let $a=0; while ($a < 500) { @@ -32,4 +35,5 @@ show indexes from tt; flush tables; show indexes from tt; +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/t/card_drop_pk.test b/storage/tokudb/mysql-test/tokudb/t/card_drop_pk.test index 365d920aa80..8de6a1dc7f2 100644 --- a/storage/tokudb/mysql-test/tokudb/t/card_drop_pk.test +++ b/storage/tokudb/mysql-test/tokudb/t/card_drop_pk.test @@ -7,6 +7,9 @@ disable_warnings; drop table if exists tt; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; + create table tt (a int, b int, c int, key(b), key(c), primary key(a)); insert into tt values (1,0,0),(2,0,0),(3,0,1),(4,0,1); @@ -22,5 +25,6 @@ show indexes from tt; # test that cardinality is persistent flush tables; show indexes from tt; +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/t/card_pk_2.test b/storage/tokudb/mysql-test/tokudb/t/card_pk_2.test index 826714931aa..b24ff0f26f0 100644 --- a/storage/tokudb/mysql-test/tokudb/t/card_pk_2.test +++ b/storage/tokudb/mysql-test/tokudb/t/card_pk_2.test @@ -5,6 +5,9 @@ disable_warnings; drop table if exists tt; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; + create table tt (a int, b int, primary key(a,b)); insert into tt values (0,0),(0,1),(1,0),(1,1); @@ -16,5 +19,6 @@ show indexes from tt; # test that cardinality is persistent flush tables; show indexes from tt; +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/t/card_pk_sk.test b/storage/tokudb/mysql-test/tokudb/t/card_pk_sk.test index f1e11fbbc2a..7e66c677930 100644 --- a/storage/tokudb/mysql-test/tokudb/t/card_pk_sk.test +++ b/storage/tokudb/mysql-test/tokudb/t/card_pk_sk.test @@ -5,6 +5,9 @@ disable_warnings; drop table if exists tt; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; + create table tt (a int, b int, primary key(a), key(b)); let $i=0; while ($i < 1000) { @@ -40,6 +43,7 @@ show indexes from tt; # test that cardinality is persistent flush tables; show indexes from tt; +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/t/card_scale_percent.test b/storage/tokudb/mysql-test/tokudb/t/card_scale_percent.test index 75c53611308..ded6401c09d 100644 --- a/storage/tokudb/mysql-test/tokudb/t/card_scale_percent.test +++ b/storage/tokudb/mysql-test/tokudb/t/card_scale_percent.test @@ -6,6 +6,9 @@ set @orig_throttle = @@session.tokudb_analyze_throttle; set @orig_time = @@session.tokudb_analyze_time; set @orig_scale_percent = @@global.tokudb_cardinality_scale_percent; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; + create table tt (a int, b int, c int, d int, primary key(a), key(b), key(c), key(d)) engine=tokudb; let $i=0; while ($i < 1000) { @@ -50,5 +53,6 @@ drop table tt; set session tokudb_analyze_throttle = @orig_throttle; set session tokudb_analyze_time = @orig_time; set global tokudb_cardinality_scale_percent = @orig_scale_percent; +set @@use_stat_tables = @save_use_stat_tables; -- enable_query_log diff --git a/storage/tokudb/mysql-test/tokudb/t/card_sk.test b/storage/tokudb/mysql-test/tokudb/t/card_sk.test index cf50b8b167b..12c9ddbb811 100644 --- a/storage/tokudb/mysql-test/tokudb/t/card_sk.test +++ b/storage/tokudb/mysql-test/tokudb/t/card_sk.test @@ -5,6 +5,9 @@ disable_warnings; drop table if exists tt; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; + create table tt (a int, b int, key(b)); insert into tt values (1,0),(2,1),(3,2),(4,3); insert into tt values (5,0),(6,1),(7,2),(8,3); @@ -17,5 +20,6 @@ show indexes from tt; # test that cardinality is persistent flush tables; show indexes from tt; +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb/t/card_sk_2.test b/storage/tokudb/mysql-test/tokudb/t/card_sk_2.test index 2cd4ece972e..f29b938105f 100644 --- a/storage/tokudb/mysql-test/tokudb/t/card_sk_2.test +++ b/storage/tokudb/mysql-test/tokudb/t/card_sk_2.test @@ -5,6 +5,9 @@ disable_warnings; drop table if exists tt; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; + create table tt (a int, b int, key(a,b)); insert into tt values (0,0),(0,1),(1,0),(1,1); @@ -16,5 +19,6 @@ show indexes from tt; # test that cardinality is persistent flush tables; show indexes from tt; +set @@use_stat_tables = @save_use_stat_tables; drop table tt; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash.result index 65b79f136a9..fb4718353be 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists t; +set @save_use_stat_tables= @@use_stat_tables; +set @@use_stat_tables= COMPLEMENTARY; create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; show indexes from t; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -19,4 +21,5 @@ show indexes from t; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t 0 PRIMARY 1 id A 6 NULL NULL BTREE t 1 x 1 x A 6 NULL NULL YES BTREE +set @@use_stat_tables= @save_use_stat_tables; drop table t; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1.result index f62e90bdecf..9746eb81aa1 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists t; +set @save_use_stat_tables= @@use_stat_tables; +set @@use_stat_tables= COMPLEMENTARY; create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; show indexes from t; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -18,4 +20,5 @@ show indexes from t; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t 0 PRIMARY 1 id A 4 NULL NULL BTREE t 1 x 1 x A 4 NULL NULL YES BTREE +set @@use_stat_tables= @save_use_stat_tables; drop table t; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1_pick.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1_pick.result index 7609a5a1504..33c60935952 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1_pick.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1_pick.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists t; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; show indexes from t; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -19,4 +21,5 @@ show indexes from t; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t 0 PRIMARY 1 id A 7 NULL NULL BTREE t 1 x 1 x A 7 NULL NULL YES BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table t; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2.result index 39c59f51b3c..02939dba662 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists t; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; show indexes from t; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -18,4 +20,5 @@ show indexes from t; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t 0 PRIMARY 1 id A 4 NULL NULL BTREE t 1 x 1 x A 4 NULL NULL YES BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table t; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/db757_part_alter_analyze.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db757_part_alter_analyze.result index e839d5fd527..c9b32d51471 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/db757_part_alter_analyze.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db757_part_alter_analyze.result @@ -1,5 +1,7 @@ set default_storage_engine='tokudb'; drop table if exists t; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table t (id int, x int, y int, primary key (id), key (x), key (y)) partition by range(id) ( partition p0 values less than (10), partition p1 values less than maxvalue); @@ -31,7 +33,7 @@ insert into t values (100,1,1),(200,2,1),(300,3,1),(400,4,1),(500,5,1); show indexes from t; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t 0 PRIMARY 1 id A 9 NULL NULL BTREE -t 1 x 1 x A 2 NULL NULL YES BTREE +t 1 x 1 x A 9 NULL NULL YES BTREE t 1 y 1 y A 9 NULL NULL YES BTREE alter table t analyze partition p0; Table Op Msg_type Msg_text @@ -51,4 +53,5 @@ Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_par t 0 PRIMARY 1 id A 9 NULL NULL BTREE t 1 x 1 x A 9 NULL NULL YES BTREE t 1 y 1 y A 9 NULL NULL YES BTREE +set @@use_stat_tables = @save_use_stat_tables; drop table t; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash.test index 97dda1cb1b8..440a79a43d7 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash.test @@ -5,6 +5,8 @@ set default_storage_engine='tokudb'; disable_warnings; drop table if exists t; enable_warnings; +set @save_use_stat_tables= @@use_stat_tables; +set @@use_stat_tables= COMPLEMENTARY; create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; show indexes from t; insert into t values (1,1),(3,1),(5,1); @@ -12,4 +14,5 @@ insert into t values (2,1),(4,1),(6,1); show indexes from t; analyze table t; show indexes from t; +set @@use_stat_tables= @save_use_stat_tables; drop table t; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1.test index 3ef66a4b1e6..b395b70b62c 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1.test @@ -5,10 +5,14 @@ set default_storage_engine='tokudb'; disable_warnings; drop table if exists t; enable_warnings; +set @save_use_stat_tables= @@use_stat_tables; +set @@use_stat_tables= COMPLEMENTARY; + create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; show indexes from t; insert into t values (1,1),(3,1),(5,1); show indexes from t; analyze table t; show indexes from t; +set @@use_stat_tables= @save_use_stat_tables; drop table t; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1_pick.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1_pick.test index b8044641109..c96c58f31ed 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1_pick.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1_pick.test @@ -5,6 +5,8 @@ set default_storage_engine='tokudb'; disable_warnings; drop table if exists t; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; show indexes from t; insert into t values (1,1),(3,2),(5,3); @@ -12,4 +14,5 @@ insert into t values (2,1),(4,1),(6,1),(8,1); show indexes from t; analyze table t; show indexes from t; +set @@use_stat_tables = @save_use_stat_tables; drop table t; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_2.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_2.test index ca10218cb05..de32dfd7f54 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_2.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_2.test @@ -5,10 +5,14 @@ set default_storage_engine='tokudb'; disable_warnings; drop table if exists t; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; + create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; show indexes from t; insert into t values (2,1),(4,1),(6,1); show indexes from t; analyze table t; show indexes from t; +set @@use_stat_tables = @save_use_stat_tables; drop table t; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db757_part_alter_analyze.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db757_part_alter_analyze.test index fc1599591be..ab9d816be4b 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/db757_part_alter_analyze.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db757_part_alter_analyze.test @@ -4,6 +4,8 @@ set default_storage_engine='tokudb'; disable_warnings; drop table if exists t; enable_warnings; +set @save_use_stat_tables = @@use_stat_tables; +set @@use_stat_tables = COMPLEMENTARY; create table t (id int, x int, y int, primary key (id), key (x), key (y)) partition by range(id) @@ -22,5 +24,6 @@ alter table t analyze partition p0; show indexes from t; alter table t analyze partition p1; show indexes from t; +set @@use_stat_tables = @save_use_stat_tables; drop table t; |