diff options
Diffstat (limited to 'mysql-test/suite/innodb_zip/r/page_size,4k.rdiff')
| -rw-r--r-- | mysql-test/suite/innodb_zip/r/page_size,4k.rdiff | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff b/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff index c12527fd8a3..637c33416cd 100644 --- a/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff +++ b/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff @@ -9,7 +9,7 @@ # Test 3) Query some information_shema tables that are dependent upon # the page size. SELECT t.name table_name, t.n_cols, t.flag table_flags, -@@ -32,13 +32,13 @@ +@@ -36,13 +36,13 @@ table_name n_cols table_flags index_name root_page type n_fields merge_threshold test/t1 5 0 PRIMARY 3 3 1 50 test/t2 5 1 PRIMARY 3 3 1 50 @@ -25,7 +25,7 @@ test/t4 Single DEFAULT DEFAULT Dynamic MYSQLD_DATADIR/test/t4.ibd DROP TABLE t1, t2, t3, t4; # Test 4) The maximum row size is dependent upon the page size. -@@ -47,141 +47,90 @@ +@@ -51,141 +51,90 @@ SET SESSION innodb_strict_mode = ON; CREATE TABLE t1 ( c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200), @@ -213,7 +213,7 @@ ALTER TABLE t1 KEY_BLOCK_SIZE=4; SHOW WARNINGS; Level Code Message -@@ -213,15 +162,21 @@ +@@ -217,15 +166,21 @@ DROP TABLE t1; SET SESSION innodb_strict_mode = OFF; CREATE TABLE t1 (i int) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=16; @@ -235,7 +235,7 @@ SELECT table_name, row_format, create_options FROM information_schema.tables WHERE table_name = 't1'; table_name row_format create_options -@@ -265,6 +220,7 @@ +@@ -269,6 +224,7 @@ ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options") SHOW WARNINGS; Level Code Message @@ -243,7 +243,7 @@ Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. Error 1005 Can't create table `test`.`t4` (errno: 140 "Wrong create options") Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -@@ -272,6 +228,7 @@ +@@ -276,105 +232,11 @@ ERROR HY000: Can't create table `test`.`t5` (errno: 140 "Wrong create options") SHOW WARNINGS; Level Code Message @@ -251,25 +251,7 @@ Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -@@ -283,6 +240,7 @@ - ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options") - SHOW WARNINGS; - Level Code Message -+Warning 1478 InnoDB: KEY_BLOCK_SIZE=8 cannot be larger than 4. - Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. - Error 1005 Can't create table `test`.`t4` (errno: 140 "Wrong create options") - Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -@@ -290,107 +248,13 @@ - ERROR HY000: Can't create table `test`.`t5` (errno: 140 "Wrong create options") - SHOW WARNINGS; - Level Code Message -+Warning 1478 InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 4. - Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. - Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") - Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB - SET GLOBAL innodb_file_format = `Barracuda`; - Warnings: - Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See https://mariadb.com/kb/en/library/xtradbinnodb-file-format/ + SET GLOBAL innodb_file_per_table = ON; -# Test 7) This series of tests were moved from innodb-index to here -# because the second alter table t1 assumes a 16k page size. -# Moving the test allows the rest of innodb-index to be run on all @@ -368,7 +350,7 @@ # Test 8) Test creating a table that could lead to undo log overflow. CREATE TABLE t1(a blob,b blob,c blob,d blob,e blob,f blob,g blob, h blob,i blob,j blob,k blob,l blob,m blob,n blob, -@@ -405,10 +269,6 @@ +@@ -389,10 +251,6 @@ UPDATE t1 SET a=@b,b=@b,c=@b,d=@b,e=@b,f=@b,g=@b,h=@b,i=@b,j=@b, k=@b,l=@b,m=@b,n=@b,o=@b,p=@b,q=@b,r=@b,s=@b,t=@b,u=@b; CREATE INDEX t1a ON t1 (a(767)); @@ -379,7 +361,7 @@ UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c, k=@c,l=@c,m=@c,n=@c,o=@c,p=@c,q=@c,r=@c,s=@c,t=@c,u=@c; CREATE INDEX t1f ON t1 (f(767)); -@@ -423,37 +283,15 @@ +@@ -407,37 +265,15 @@ COMMIT; CREATE INDEX t1g ON t1 (g(767)); UPDATE t1 SET g=@e; @@ -421,7 +403,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( -@@ -479,28 +317,12 @@ +@@ -463,28 +299,12 @@ `t` blob DEFAULT NULL, `u` blob DEFAULT NULL, KEY `t1a` (`a`(767)), @@ -452,7 +434,7 @@ ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC DROP TABLE t1; # Bug#12547647 UPDATE LOGGING COULD EXCEED LOG PAGE SIZE -@@ -581,27 +403,25 @@ +@@ -565,27 +385,25 @@ DROP TABLE t1; CREATE TABLE t1( c text NOT NULL, d text NOT NULL, |