diff options
Diffstat (limited to 'mysql-test/suite/maria')
19 files changed, 177 insertions, 157 deletions
diff --git a/mysql-test/suite/maria/alter.result b/mysql-test/suite/maria/alter.result index e1a57ed654f..0bb8c89c1db 100644 --- a/mysql-test/suite/maria/alter.result +++ b/mysql-test/suite/maria/alter.result @@ -184,3 +184,12 @@ SET GLOBAL aria_max_sort_file_size= @max_size.save; # # End of 10.4 test # +# +# MDEV-25505 Assertion `old_flags == ((my_flags & 0x10000U) ? 1 : 0)' +# failed in my_realloc +# +CREATE TABLE t1 (pk int, c text, primary key (pk), key(c(32))) ENGINE=Aria ROW_FORMAT=DYNAMIC; +ALTER TABLE t1 DISABLE KEYS; +INSERT INTO t1 VALUES (1, 'Nine chars or more'); +ALTER TABLE t1 ENABLE KEYS; +DROP TABLE t1; diff --git a/mysql-test/suite/maria/alter.test b/mysql-test/suite/maria/alter.test index f2950f0a6d3..525cd80f3d9 100644 --- a/mysql-test/suite/maria/alter.test +++ b/mysql-test/suite/maria/alter.test @@ -192,3 +192,14 @@ SET GLOBAL aria_max_sort_file_size= @max_size.save; --echo # --echo # End of 10.4 test --echo # + +--echo # +--echo # MDEV-25505 Assertion `old_flags == ((my_flags & 0x10000U) ? 1 : 0)' +--echo # failed in my_realloc +--echo # + +CREATE TABLE t1 (pk int, c text, primary key (pk), key(c(32))) ENGINE=Aria ROW_FORMAT=DYNAMIC; +ALTER TABLE t1 DISABLE KEYS; +INSERT INTO t1 VALUES (1, 'Nine chars or more'); +ALTER TABLE t1 ENABLE KEYS; +DROP TABLE t1; diff --git a/mysql-test/suite/maria/bulk_insert_crash.result b/mysql-test/suite/maria/bulk_insert_crash.result index fc28bf325ba..0cf5a474939 100644 --- a/mysql-test/suite/maria/bulk_insert_crash.result +++ b/mysql-test/suite/maria/bulk_insert_crash.result @@ -3,7 +3,7 @@ insert into t1 values (1000,1000,1000); insert into t1 select seq,seq+100, seq+200 from seq_1_to_10; SET GLOBAL debug_dbug="+d,crash_end_bulk_insert"; REPLACE into t1 select seq+20,seq+95, seq + 300 from seq_1_to_10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t1; Table Op Msg_type Msg_text test.t1 check status OK diff --git a/mysql-test/suite/maria/fulltext2.test b/mysql-test/suite/maria/fulltext2.test index 060b748eb4f..1fbece4fe95 100644 --- a/mysql-test/suite/maria/fulltext2.test +++ b/mysql-test/suite/maria/fulltext2.test @@ -2,7 +2,7 @@ # test of new fulltext search features # -let collation=utf8_unicode_ci; +let collation=utf8mb3_unicode_ci; source include/have_collation.inc; # diff --git a/mysql-test/suite/maria/maria-gis-recovery.result b/mysql-test/suite/maria/maria-gis-recovery.result index f84a01fb854..d95b468bbf6 100644 --- a/mysql-test/suite/maria/maria-gis-recovery.result +++ b/mysql-test/suite/maria/maria-gis-recovery.result @@ -28,7 +28,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -59,7 +59,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; diff --git a/mysql-test/suite/maria/maria-recovery-big.result b/mysql-test/suite/maria/maria-recovery-big.result index a04e24eab74..f9e5c81d8bb 100644 --- a/mysql-test/suite/maria/maria-recovery-big.result +++ b/mysql-test/suite/maria/maria-recovery-big.result @@ -73,7 +73,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; diff --git a/mysql-test/suite/maria/maria-recovery-bitmap.result b/mysql-test/suite/maria/maria-recovery-bitmap.result index c6d0e2cb4e1..78ae6944aa8 100644 --- a/mysql-test/suite/maria/maria-recovery-bitmap.result +++ b/mysql-test/suite/maria/maria-recovery-bitmap.result @@ -25,7 +25,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -47,7 +47,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_bitmap,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text diff --git a/mysql-test/suite/maria/maria-recovery-rtree-ft.result b/mysql-test/suite/maria/maria-recovery-rtree-ft.result index bb7d864b6b1..329cc71c6e9 100644 --- a/mysql-test/suite/maria/maria-recovery-rtree-ft.result +++ b/mysql-test/suite/maria/maria-recovery-rtree-ft.result @@ -15,14 +15,14 @@ name VARCHAR(32) ,SPATIAL key (line) ) transactional=1 row_format=page engine=aria; SHOW INDEX FROM t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 line 1 line A NULL 32 NULL SPATIAL +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 line 1 line A NULL 32 NULL SPATIAL NO CREATE TABLE t2 (a VARCHAR(200), b TEXT, FULLTEXT (a,b) ) transactional=1 row_format=page engine=aria; SHOW INDEX FROM t2; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t2 1 a 1 a NULL NULL NULL NULL YES FULLTEXT -t2 1 a 2 b NULL NULL NULL NULL YES FULLTEXT +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t2 1 a 1 a NULL NULL NULL NULL YES FULLTEXT NO +t2 1 a 2 b NULL NULL NULL NULL YES FULLTEXT NO * TEST of REDO: see if recovery can reconstruct if we give it an old table connection admin; * copied t2 for feeding_recovery @@ -38,7 +38,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t2 back for feeding_recovery * copied t1 back for feeding_recovery * recovery happens @@ -68,7 +68,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t2 extended; Table Op Msg_type Msg_text @@ -95,7 +95,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t2 extended; Table Op Msg_type Msg_text @@ -122,7 +122,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_states,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t2 extended; Table Op Msg_type Msg_text @@ -149,7 +149,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t2 extended; Table Op Msg_type Msg_text @@ -169,7 +169,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t2 extended; Table Op Msg_type Msg_text diff --git a/mysql-test/suite/maria/maria-recovery.result b/mysql-test/suite/maria/maria-recovery.result index 915dc53b460..9aa9213d9bd 100644 --- a/mysql-test/suite/maria/maria-recovery.result +++ b/mysql-test/suite/maria/maria-recovery.result @@ -22,7 +22,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -49,7 +49,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -74,7 +74,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -100,7 +100,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_states,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -127,7 +127,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -171,7 +171,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -210,7 +210,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -242,7 +242,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -272,7 +272,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -316,7 +316,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens connection default; use mysqltest; diff --git a/mysql-test/suite/maria/maria-recovery2.result b/mysql-test/suite/maria/maria-recovery2.result index 0ed49ab8142..4240e76f141 100644 --- a/mysql-test/suite/maria/maria-recovery2.result +++ b/mysql-test/suite/maria/maria-recovery2.result @@ -25,7 +25,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -60,7 +60,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -93,7 +93,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -134,7 +134,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -145,8 +145,8 @@ ok connection default; use mysqltest; show keys from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 1 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 1 NULL NULL YES BTREE NO select count(*) from t1; count(*) 1 @@ -162,7 +162,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash_sort_index"; * crashing mysqld intentionally optimize table t_corrupted1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t_corrupted1 extended; Table Op Msg_type Msg_text diff --git a/mysql-test/suite/maria/maria-recovery3.result b/mysql-test/suite/maria/maria-recovery3.result index 9d25cd13b90..e7a32396eaa 100644 --- a/mysql-test/suite/maria/maria-recovery3.result +++ b/mysql-test/suite/maria/maria-recovery3.result @@ -25,7 +25,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -67,7 +67,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -96,11 +96,11 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash_create_table"; * crashing mysqld intentionally truncate table t1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text -mysqltest.t1 check warning Size of indexfile is: <SIZE> Expected: 8192 +mysqltest.t1 check warning Size of indexfile is: <SIZE> Expected: 8192 mysqltest.t1 check status OK * testing that checksum after recovery is as expected Checksum-check @@ -122,7 +122,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text diff --git a/mysql-test/suite/maria/maria-ucs2.result b/mysql-test/suite/maria/maria-ucs2.result index 7f3b691b139..5e5bc2cd312 100644 --- a/mysql-test/suite/maria/maria-ucs2.result +++ b/mysql-test/suite/maria/maria-ucs2.result @@ -28,7 +28,7 @@ t1 CREATE TABLE `t1` ( DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(1200),KEY(a)) ENGINE=Aria CHARACTER SET ucs2; Warnings: -Note 1071 Specified key was too long; max key length is 2000 bytes +Note 1071 Specified key was too long; max key length is 2300 bytes INSERT INTO t1 VALUES (REPEAT('abc ',200)); CHECK TABLE t1; Table Op Msg_type Msg_text diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result index ac28953dff8..c51e4996fa4 100644 --- a/mysql-test/suite/maria/maria.result +++ b/mysql-test/suite/maria/maria.result @@ -62,16 +62,16 @@ optimize table t1; Table Op Msg_type Msg_text test.t1 optimize status OK show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 0 PRIMARY 1 a A 5 NULL NULL BTREE -t1 1 b 1 b A 1 NULL NULL BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 0 PRIMARY 1 a A 5 NULL NULL BTREE NO +t1 1 b 1 b A 1 NULL NULL BTREE NO optimize table t1; Table Op Msg_type Msg_text test.t1 optimize status Table is already up to date show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 0 PRIMARY 1 a A 5 NULL NULL BTREE -t1 1 b 1 b A 1 NULL NULL BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 0 PRIMARY 1 a A 5 NULL NULL BTREE NO +t1 1 b 1 b A 1 NULL NULL BTREE NO drop table t1; create table t1 (a int not null, b int not null, c int not null, primary key (a),key(b)); insert into t1 values (3,3,3),(1,1,1),(2,2,2),(4,4,4); @@ -351,13 +351,13 @@ CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK drop table t1; -CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), f varchar(255), g varchar(255), h varchar(255), i varchar(255), KEY t1 (a, b, c, d, e, f, g, h, i)); -ERROR 42000: Specified key was too long; max key length is 2000 bytes +CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), f varchar(255), g varchar(255), h varchar(255), i varchar(255), j varchar(255), KEY t1 (a, b, c, d, e, f, g, h, i, j)); +ERROR 42000: Specified key was too long; max key length is 2300 bytes CREATE TABLE t1 (a varchar(1), b varchar(1), key (a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b)); ERROR 42000: Too many key parts specified; max 32 parts allowed -CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), f varchar(255), g varchar(255), h varchar(255), i varchar(255)); -ALTER TABLE t1 ADD INDEX t1 (a, b, c, d, e, f, g, h, i); -ERROR 42000: Specified key was too long; max key length is 2000 bytes +CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), f varchar(255), g varchar(255), h varchar(255), i varchar(255), j varchar(255)); +ALTER TABLE t1 ADD INDEX t1 (a, b, c, d, e, f, g, h, i, j); +ERROR 42000: Specified key was too long; max key length is 2300 bytes DROP TABLE t1; CREATE TABLE t1 (a int not null, b int, c int, key(b), key(c), key(a,b), key(c,a)); INSERT into t1 values (0,null,0), (0,null,1), (0,null,2), (0,null,3), (1,1,4); @@ -371,13 +371,13 @@ check table t1; Table Op Msg_type Msg_text test.t1 check status OK show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 b 1 b A 10 NULL NULL YES BTREE -t1 1 c 1 c A 10 NULL NULL YES BTREE -t1 1 a 1 a A 10 NULL NULL BTREE -t1 1 a 2 b A 10 NULL NULL YES BTREE -t1 1 c_2 1 c A 10 NULL NULL YES BTREE -t1 1 c_2 2 a A 10 NULL NULL BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 b 1 b A 10 NULL NULL YES BTREE NO +t1 1 c 1 c A 10 NULL NULL YES BTREE NO +t1 1 a 1 a A 10 NULL NULL BTREE NO +t1 1 a 2 b A 10 NULL NULL YES BTREE NO +t1 1 c_2 1 c A 10 NULL NULL YES BTREE NO +t1 1 c_2 2 a A 10 NULL NULL BTREE NO explain select * from t1,t2 where t1.a=t2.a; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ALL a NULL NULL NULL 2 @@ -640,29 +640,29 @@ Error 1146 Table 'test.t3' doesn't exist drop table t1,t2; create table t1 (a int, key (a)); show keys from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A NULL NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A NULL NULL NULL YES BTREE NO alter table t1 disable keys; show keys from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A NULL NULL NULL YES BTREE disabled +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A NULL NULL NULL YES BTREE disabled NO create table t2 (a int); set @@rand_seed1=31415926,@@rand_seed2=2718281828; insert t1 select * from t2; show keys from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A NULL NULL NULL YES BTREE disabled +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A NULL NULL NULL YES BTREE disabled NO alter table t1 enable keys; show keys from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 1000 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 1000 NULL NULL YES BTREE NO alter table t1 engine=heap; alter table t1 disable keys; Warnings: Note 1031 Storage engine MEMORY of the table `test`.`t1` doesn't have this option show keys from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a NULL 500 NULL NULL YES HASH +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a NULL 500 NULL NULL YES HASH NO drop table t1,t2; create table t1 ( a tinytext, b char(1), index idx (a(1),b) ); insert into t1 values (null,''), (null,''); @@ -740,16 +740,16 @@ Table Op Msg_type Msg_text test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 10 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 10 NULL NULL YES BTREE NO insert into t1 values (11); delete from t1 where a=11; check table t1; Table Op Msg_type Msg_text test.t1 check status OK show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 10 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 10 NULL NULL YES BTREE NO set aria_stats_method=nulls_equal; set @save_use_stat_tables= @@use_stat_tables; set @@use_stat_tables= COMPLEMENTARY; @@ -763,16 +763,16 @@ Table Op Msg_type Msg_text test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 5 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 5 NULL NULL YES BTREE NO insert into t1 values (11); delete from t1 where a=11; check table t1; Table Op Msg_type Msg_text test.t1 check status OK show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 5 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 5 NULL NULL YES BTREE NO set @@use_stat_tables= @save_use_stat_tables; set aria_stats_method=DEFAULT; show variables like 'aria_stats_method'; @@ -785,16 +785,16 @@ Table Op Msg_type Msg_text test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 10 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 10 NULL NULL YES BTREE NO insert into t1 values (11); delete from t1 where a=11; check table t1; Table Op Msg_type Msg_text test.t1 check status OK show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 10 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 10 NULL NULL YES BTREE NO drop table t1; set aria_stats_method=nulls_ignored; show variables like 'aria_stats_method'; @@ -815,22 +815,22 @@ Table Op Msg_type Msg_text test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 2 NULL NULL YES BTREE -t1 1 a 2 b A 4 NULL NULL YES BTREE -t1 1 a 3 c A 4 NULL NULL YES BTREE -t1 1 a 4 d A 4 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 2 NULL NULL YES BTREE NO +t1 1 a 2 b A 4 NULL NULL YES BTREE NO +t1 1 a 3 c A 4 NULL NULL YES BTREE NO +t1 1 a 4 d A 4 NULL NULL YES BTREE NO delete from t1; analyze table t1; Table Op Msg_type Msg_text test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show index from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 0 NULL NULL YES BTREE -t1 1 a 2 b A 0 NULL NULL YES BTREE -t1 1 a 3 c A 0 NULL NULL YES BTREE -t1 1 a 4 d A 0 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 0 NULL NULL YES BTREE NO +t1 1 a 2 b A 0 NULL NULL YES BTREE NO +t1 1 a 3 c A 0 NULL NULL YES BTREE NO +t1 1 a 4 d A 0 NULL NULL YES BTREE NO set @@use_stat_tables= @save_use_stat_tables; set aria_stats_method=DEFAULT; drop table t1; @@ -1561,7 +1561,7 @@ create table t1 (v char(10) character set utf8); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` char(10) CHARACTER SET utf8 DEFAULT NULL + `v` char(10) CHARACTER SET utf8mb3 DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; create table t1 (v varchar(10), c char(10)) row_format=fixed; @@ -1594,7 +1594,7 @@ a b drop table t1; create table t1 (v varchar(65530), key(v)); Warnings: -Note 1071 Specified key was too long; max key length is 2000 bytes +Note 1071 Specified key was too long; max key length is 2300 bytes drop table if exists t1; set statement sql_mode = 'NO_ENGINE_SUBSTITUTION' for create table t1 (v varchar(65536)); @@ -1613,7 +1613,7 @@ Note 1246 Converting column 'v' from VARCHAR to TEXT show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` mediumtext CHARACTER SET utf8 DEFAULT NULL + `v` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; set statement sql_mode='' for @@ -1706,13 +1706,13 @@ Table Op Msg_type Msg_text test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date show keys from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 8 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 8 NULL NULL YES BTREE NO alter table t1 disable keys; alter table t1 enable keys; show keys from t1; -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 8 NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 a 1 a A 8 NULL NULL YES BTREE NO drop table t1; connect session1,localhost,root,,; connect session2,localhost,root,,; @@ -1864,55 +1864,55 @@ t1 CREATE TABLE `t1` ( KEY `a` (`a`) KEY_BLOCK_SIZE=8192 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; -create table t1 (a varchar(2048), key `a` (a)); +create table t1 (a varchar(4096), key `a` (a)); Warnings: -Note 1071 Specified key was too long; max key length is 2000 bytes +Note 1071 Specified key was too long; max key length is 2300 bytes show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(2048) DEFAULT NULL, - KEY `a` (`a`(2000)) + `a` varchar(4096) DEFAULT NULL, + KEY `a` (`a`(2300)) ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; -create table t1 (a varchar(2048), key `a` (a) key_block_size=1024); +create table t1 (a varchar(4096), key `a` (a) key_block_size=1024); Warnings: -Note 1071 Specified key was too long; max key length is 2000 bytes +Note 1071 Specified key was too long; max key length is 2300 bytes show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(2048) DEFAULT NULL, - KEY `a` (`a`(2000)) KEY_BLOCK_SIZE=8192 + `a` varchar(4096) DEFAULT NULL, + KEY `a` (`a`(2300)) KEY_BLOCK_SIZE=8192 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; -create table t1 (a int not null, b varchar(2048), key (a), key(b)) key_block_size=1024; +create table t1 (a int not null, b varchar(4096), key (a), key(b)) key_block_size=1024; Warnings: -Note 1071 Specified key was too long; max key length is 2000 bytes +Note 1071 Specified key was too long; max key length is 2300 bytes show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, - `b` varchar(2048) DEFAULT NULL, + `b` varchar(4096) DEFAULT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=8192, - KEY `b` (`b`(2000)) KEY_BLOCK_SIZE=8192 + KEY `b` (`b`(2300)) KEY_BLOCK_SIZE=8192 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=1024 alter table t1 key_block_size=2048; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, - `b` varchar(2048) DEFAULT NULL, + `b` varchar(4096) DEFAULT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=8192, - KEY `b` (`b`(2000)) KEY_BLOCK_SIZE=8192 + KEY `b` (`b`(2300)) KEY_BLOCK_SIZE=8192 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=2048 alter table t1 add c int, add key (c); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, - `b` varchar(2048) DEFAULT NULL, + `b` varchar(4096) DEFAULT NULL, `c` int(11) DEFAULT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=8192, - KEY `b` (`b`(2000)) KEY_BLOCK_SIZE=8192, + KEY `b` (`b`(2300)) KEY_BLOCK_SIZE=8192, KEY `c` (`c`) KEY_BLOCK_SIZE=8192 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=2048 alter table t1 key_block_size=4096; @@ -1920,10 +1920,10 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, - `b` varchar(2048) DEFAULT NULL, + `b` varchar(4096) DEFAULT NULL, `c` int(11) DEFAULT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=8192, - KEY `b` (`b`(2000)) KEY_BLOCK_SIZE=8192, + KEY `b` (`b`(2300)) KEY_BLOCK_SIZE=8192, KEY `c` (`c`) KEY_BLOCK_SIZE=8192 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=4096 alter table t1 key_block_size=0; @@ -1931,10 +1931,10 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, - `b` varchar(2048) DEFAULT NULL, + `b` varchar(4096) DEFAULT NULL, `c` int(11) DEFAULT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=8192, - KEY `b` (`b`(2000)) KEY_BLOCK_SIZE=8192, + KEY `b` (`b`(2300)) KEY_BLOCK_SIZE=8192, KEY `c` (`c`) KEY_BLOCK_SIZE=8192 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 alter table t1 add d int, add key (d); @@ -1942,37 +1942,37 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, - `b` varchar(2048) DEFAULT NULL, + `b` varchar(4096) DEFAULT NULL, `c` int(11) DEFAULT NULL, `d` int(11) DEFAULT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=8192, - KEY `b` (`b`(2000)) KEY_BLOCK_SIZE=8192, + KEY `b` (`b`(2300)) KEY_BLOCK_SIZE=8192, KEY `c` (`c`) KEY_BLOCK_SIZE=8192, KEY `d` (`d`) ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; -create table t1 (a int not null, b varchar(2048), key (a), key(b)) key_block_size=8192; +create table t1 (a int not null, b varchar(4096), key (a), key(b)) key_block_size=8192; Warnings: -Note 1071 Specified key was too long; max key length is 2000 bytes +Note 1071 Specified key was too long; max key length is 2300 bytes show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, - `b` varchar(2048) DEFAULT NULL, + `b` varchar(4096) DEFAULT NULL, KEY `a` (`a`), - KEY `b` (`b`(2000)) + KEY `b` (`b`(2300)) ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=8192 drop table t1; -create table t1 (a int not null, b varchar(2048), key (a) key_block_size=1024, key(b)) key_block_size=8192; +create table t1 (a int not null, b varchar(4096), key (a) key_block_size=1024, key(b)) key_block_size=8192; Warnings: -Note 1071 Specified key was too long; max key length is 2000 bytes +Note 1071 Specified key was too long; max key length is 2300 bytes show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, - `b` varchar(2048) DEFAULT NULL, + `b` varchar(4096) DEFAULT NULL, KEY `a` (`a`), - KEY `b` (`b`(2000)) + KEY `b` (`b`(2300)) ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=8192 drop table t1; create table t1 (a int not null, b int, key (a) key_block_size=1024, key(b) key_block_size=8192) key_block_size=16384; @@ -1993,14 +1993,14 @@ t1 CREATE TABLE `t1` ( KEY `a` (`a`) KEY_BLOCK_SIZE=8192 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; -create table t1 (a varchar(2048), key `a` (a) key_block_size=1000000000000000000); +create table t1 (a varchar(4096), key `a` (a) key_block_size=1000000000000000000); Warnings: -Note 1071 Specified key was too long; max key length is 2000 bytes +Note 1071 Specified key was too long; max key length is 2300 bytes show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(2048) DEFAULT NULL, - KEY `a` (`a`(2000)) KEY_BLOCK_SIZE=8192 + `a` varchar(4096) DEFAULT NULL, + KEY `a` (`a`(2300)) KEY_BLOCK_SIZE=8192 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; create table t1 (a int not null, key `a` (a) key_block_size=1025); @@ -2232,7 +2232,7 @@ KEY (c2) Aria file: MYSQLD_DATADIR/test/t1 Record format: Block Crashsafe: yes -Character set: utf8_general_ci (33) +Character set: utf8mb3_general_ci (33) Data records: 0 Deleted blocks: 0 Block_size: 8192 Recordlength: 99 diff --git a/mysql-test/suite/maria/maria.test b/mysql-test/suite/maria/maria.test index c940fc66bd4..123996bed05 100644 --- a/mysql-test/suite/maria/maria.test +++ b/mysql-test/suite/maria/maria.test @@ -373,12 +373,12 @@ drop table t1; # --error 1071 -CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), f varchar(255), g varchar(255), h varchar(255), i varchar(255), KEY t1 (a, b, c, d, e, f, g, h, i)); +CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), f varchar(255), g varchar(255), h varchar(255), i varchar(255), j varchar(255), KEY t1 (a, b, c, d, e, f, g, h, i, j)); --error 1070 CREATE TABLE t1 (a varchar(1), b varchar(1), key (a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b)); -CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), f varchar(255), g varchar(255), h varchar(255), i varchar(255)); +CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), f varchar(255), g varchar(255), h varchar(255), i varchar(255), j varchar(255)); --error 1071 -ALTER TABLE t1 ADD INDEX t1 (a, b, c, d, e, f, g, h, i); +ALTER TABLE t1 ADD INDEX t1 (a, b, c, d, e, f, g, h, i, j); DROP TABLE t1; # @@ -1159,15 +1159,15 @@ create table t1 (a int not null, key `a` (a) key_block_size=2048); show create table t1; drop table t1; -create table t1 (a varchar(2048), key `a` (a)); +create table t1 (a varchar(4096), key `a` (a)); show create table t1; drop table t1; -create table t1 (a varchar(2048), key `a` (a) key_block_size=1024); +create table t1 (a varchar(4096), key `a` (a) key_block_size=1024); show create table t1; drop table t1; -create table t1 (a int not null, b varchar(2048), key (a), key(b)) key_block_size=1024; +create table t1 (a int not null, b varchar(4096), key (a), key(b)) key_block_size=1024; show create table t1; alter table t1 key_block_size=2048; show create table t1; @@ -1181,11 +1181,11 @@ alter table t1 add d int, add key (d); show create table t1; drop table t1; -create table t1 (a int not null, b varchar(2048), key (a), key(b)) key_block_size=8192; +create table t1 (a int not null, b varchar(4096), key (a), key(b)) key_block_size=8192; show create table t1; drop table t1; -create table t1 (a int not null, b varchar(2048), key (a) key_block_size=1024, key(b)) key_block_size=8192; +create table t1 (a int not null, b varchar(4096), key (a) key_block_size=1024, key(b)) key_block_size=8192; show create table t1; drop table t1; @@ -1199,7 +1199,7 @@ create table t1 (a int not null, key `a` (a) key_block_size=512); show create table t1; drop table t1; -create table t1 (a varchar(2048), key `a` (a) key_block_size=1000000000000000000); +create table t1 (a varchar(4096), key `a` (a) key_block_size=1000000000000000000); show create table t1; drop table t1; diff --git a/mysql-test/suite/maria/maria3.result b/mysql-test/suite/maria/maria3.result index 871748b399a..fa794029226 100644 --- a/mysql-test/suite/maria/maria3.result +++ b/mysql-test/suite/maria/maria3.result @@ -15,14 +15,14 @@ t1 CREATE TABLE `t1` ( KEY `a` (`a`) KEY_BLOCK_SIZE=8192 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; -create table t1 (a varchar(2048), key `a` (a) key_block_size=1000000000000000000); +create table t1 (a varchar(4096), key `a` (a) key_block_size=1000000000000000000); Warnings: -Note 1071 Specified key was too long; max key length is 2000 bytes +Note 1071 Specified key was too long; max key length is 2300 bytes show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(2048) DEFAULT NULL, - KEY `a` (`a`(2000)) KEY_BLOCK_SIZE=8192 + `a` varchar(4096) DEFAULT NULL, + KEY `a` (`a`(2300)) KEY_BLOCK_SIZE=8192 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; create table t1 (a int not null, key `a` (a) key_block_size=1025); diff --git a/mysql-test/suite/maria/maria3.test b/mysql-test/suite/maria/maria3.test index bf533228300..d8f0721cd9a 100644 --- a/mysql-test/suite/maria/maria3.test +++ b/mysql-test/suite/maria/maria3.test @@ -22,7 +22,7 @@ create table t1 (a int not null, key `a` (a) key_block_size=512); show create table t1; drop table t1; -create table t1 (a varchar(2048), key `a` (a) key_block_size=1000000000000000000); +create table t1 (a varchar(4096), key `a` (a) key_block_size=1000000000000000000); show create table t1; drop table t1; diff --git a/mysql-test/suite/maria/max_length.result b/mysql-test/suite/maria/max_length.result index 4403ce5d0d2..ca02eb6f4b2 100644 --- a/mysql-test/suite/maria/max_length.result +++ b/mysql-test/suite/maria/max_length.result @@ -54,20 +54,20 @@ insert into t1 (v,b) select v,b from t2; ERROR HY000: The table 't1' is full check table t1; Table Op Msg_type Msg_text -test.t1 check warning Datafile is almost full, 268230656 of 268320768 used +test.t1 check warning Datafile is almost full, 268230656 of 268320768 used test.t1 check status OK insert into t1 values(null, repeat("gh",400),repeat("jkl",10000)); ERROR HY000: The table 't1' is full check table t1; Table Op Msg_type Msg_text -test.t1 check warning Datafile is almost full, 268230656 of 268320768 used +test.t1 check warning Datafile is almost full, 268230656 of 268320768 used test.t1 check status OK truncate table t1; insert into t1 (v,b) select v,b from t2; ERROR HY000: The table 't1' is full check table t1; Table Op Msg_type Msg_text -test.t1 check warning Datafile is almost full, 268230656 of 268320768 used +test.t1 check warning Datafile is almost full, 268230656 of 268320768 used test.t1 check status OK drop table t1,t2; create table t1 ( @@ -135,7 +135,7 @@ count(*) 3276 check table t1; Table Op Msg_type Msg_text -test.t1 check warning Datafile is almost full, 65520 of 65535 used +test.t1 check warning Datafile is almost full, 65520 of 65535 used test.t1 check status OK create or replace table t1 ( c1 int unsigned, @@ -172,7 +172,7 @@ count(*) 6189940 check table t1; Table Op Msg_type Msg_text -test.t1 check warning Datafile is almost full, 268320768 of 268320768 used +test.t1 check warning Datafile is almost full, 268320768 of 268320768 used test.t1 check status OK show table status like "t1"; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary diff --git a/mysql-test/suite/maria/mrr.result b/mysql-test/suite/maria/mrr.result index df915e4a15d..a8d444d4bd4 100644 --- a/mysql-test/suite/maria/mrr.result +++ b/mysql-test/suite/maria/mrr.result @@ -423,12 +423,12 @@ set join_buffer_size=10240; CREATE TABLE t1 ( f2 varchar(32) COLLATE latin1_swedish_ci, f3 int(11), -f4 varchar(2048) COLLATE utf8_bin, -f5 varchar(2048) COLLATE latin1_bin, +f4 varchar(4096) COLLATE utf8_bin, +f5 varchar(4096) COLLATE latin1_bin, KEY (f5) ) ENGINE=Aria TRANSACTIONAL=0 ; Warnings: -Note 1071 Specified key was too long; max key length is 2000 bytes +Note 1071 Specified key was too long; max key length is 2300 bytes # Fill the table with some data SELECT alias2.* , alias1.f2 FROM diff --git a/mysql-test/suite/maria/mrr.test b/mysql-test/suite/maria/mrr.test index 45d75a9d795..49da28fda5e 100644 --- a/mysql-test/suite/maria/mrr.test +++ b/mysql-test/suite/maria/mrr.test @@ -144,8 +144,8 @@ set join_buffer_size=10240; CREATE TABLE t1 ( f2 varchar(32) COLLATE latin1_swedish_ci, f3 int(11), - f4 varchar(2048) COLLATE utf8_bin, - f5 varchar(2048) COLLATE latin1_bin, + f4 varchar(4096) COLLATE utf8_bin, + f5 varchar(4096) COLLATE latin1_bin, KEY (f5) ) ENGINE=Aria TRANSACTIONAL=0 ; |