diff options
Diffstat (limited to 'mysql-test/suite/maria')
| -rw-r--r-- | mysql-test/suite/maria/lock.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria-gis-rtree-dynamic.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria-gis-rtree-trans.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria-gis-rtree.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria-page-checksum.result | 108 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria-page-checksum.test | 108 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria-partitioning.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria-ucs2.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria3.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria3.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/max_length.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/maria/small_blocksize.result | 2 |
12 files changed, 120 insertions, 121 deletions
diff --git a/mysql-test/suite/maria/lock.result b/mysql-test/suite/maria/lock.result index b67d1ab7b0d..52e83eb111d 100644 --- a/mysql-test/suite/maria/lock.result +++ b/mysql-test/suite/maria/lock.result @@ -1,7 +1,7 @@ drop table if exists t1,t2; Warnings: -Note 1051 Unknown table 't1' -Note 1051 Unknown table 't2' +Note 1051 Unknown table 'test.t1' +Note 1051 Unknown table 'test.t2' CREATE TABLE t1 (i INT) ENGINE=Aria; CREATE TABLE t2 (i INT) ENGINE=Aria; LOCK TABLE t1 WRITE, t2 WRITE; diff --git a/mysql-test/suite/maria/maria-gis-rtree-dynamic.result b/mysql-test/suite/maria/maria-gis-rtree-dynamic.result index ee7135c4851..f8487258546 100644 --- a/mysql-test/suite/maria/maria-gis-rtree-dynamic.result +++ b/mysql-test/suite/maria/maria-gis-rtree-dynamic.result @@ -713,7 +713,7 @@ count(*) DROP TABLE t2; drop table if exists t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' CREATE TABLE t1 (a geometry NOT NULL, SPATIAL (a)) row_format=dynamic; INSERT INTO t1 VALUES (GeomFromText("LINESTRING(100 100, 200 200, 300 300)")); INSERT INTO t1 VALUES (GeomFromText("LINESTRING(100 100, 200 200, 300 300)")); diff --git a/mysql-test/suite/maria/maria-gis-rtree-trans.result b/mysql-test/suite/maria/maria-gis-rtree-trans.result index dba56204172..a8ea6f1d112 100644 --- a/mysql-test/suite/maria/maria-gis-rtree-trans.result +++ b/mysql-test/suite/maria/maria-gis-rtree-trans.result @@ -713,7 +713,7 @@ count(*) DROP TABLE t2; drop table if exists t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' CREATE TABLE t1 (a geometry NOT NULL, SPATIAL (a)) transactional=1 row_format=page; INSERT INTO t1 VALUES (GeomFromText("LINESTRING(100 100, 200 200, 300 300)")); INSERT INTO t1 VALUES (GeomFromText("LINESTRING(100 100, 200 200, 300 300)")); diff --git a/mysql-test/suite/maria/maria-gis-rtree.result b/mysql-test/suite/maria/maria-gis-rtree.result index 1a7b08169dc..c7c65fac003 100644 --- a/mysql-test/suite/maria/maria-gis-rtree.result +++ b/mysql-test/suite/maria/maria-gis-rtree.result @@ -713,7 +713,7 @@ count(*) DROP TABLE t2; drop table if exists t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' CREATE TABLE t1 (a geometry NOT NULL, SPATIAL (a)) transactional=0 row_format=page; INSERT INTO t1 VALUES (GeomFromText("LINESTRING(100 100, 200 200, 300 300)")); INSERT INTO t1 VALUES (GeomFromText("LINESTRING(100 100, 200 200, 300 300)")); diff --git a/mysql-test/suite/maria/maria-page-checksum.result b/mysql-test/suite/maria/maria-page-checksum.result index c4d1b71e33a..fbb7ba78b25 100644 --- a/mysql-test/suite/maria/maria-page-checksum.result +++ b/mysql-test/suite/maria/maria-page-checksum.result @@ -2,7 +2,7 @@ drop table if exists t1; select @@global.aria_page_checksum; @@global.aria_page_checksum 1 -# iteration 1 +# iteration 1a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -20,7 +20,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 2 +# iteration 2a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -38,7 +38,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 3 +# iteration 3a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -56,7 +56,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 4 +# iteration 4a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -74,7 +74,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 5 +# iteration 5a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -92,7 +92,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 6 +# iteration 6a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -110,7 +110,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 7 +# iteration 7a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -128,7 +128,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 8 +# iteration 8a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -146,7 +146,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 9 +# iteration 9a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -164,7 +164,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 10 +# iteration 10a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -182,7 +182,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 11 +# iteration 11a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -200,7 +200,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 12 +# iteration 12a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -218,7 +218,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 13 +# iteration 13a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -236,7 +236,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 14 +# iteration 14a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -254,7 +254,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 15 +# iteration 15a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -272,7 +272,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 16 +# iteration 16a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -290,7 +290,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 17 +# iteration 17a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -308,7 +308,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 18 +# iteration 18a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -326,7 +326,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 19 +# iteration 19a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -344,7 +344,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 20 +# iteration 20a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -362,7 +362,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 21 +# iteration 21a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -380,7 +380,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 22 +# iteration 22a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -398,7 +398,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 23 +# iteration 23a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -416,7 +416,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 24 +# iteration 24a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -434,7 +434,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 25 +# iteration 25a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -452,7 +452,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 26 +# iteration 26a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -470,7 +470,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 27 +# iteration 27a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -488,7 +488,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 28 +# iteration 28a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -506,7 +506,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 29 +# iteration 29a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -524,7 +524,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 30 +# iteration 30a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -542,7 +542,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 31 +# iteration 31a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -560,7 +560,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 32 +# iteration 32a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -578,7 +578,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 33 +# iteration 33a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -596,7 +596,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 34 +# iteration 34a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -614,7 +614,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 35 +# iteration 35a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -632,7 +632,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 Page checksums are not used drop table t1; -# iteration 36 +# iteration 36a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -650,7 +650,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Page checksums are used drop table t1; -# iteration 1 +# iteration 1b create table t1(a int) engine=aria ; show create table t1; Table Create Table @@ -666,7 +666,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Crashsafe: yes drop table t1; -# iteration 2 +# iteration 2b create table t1(a int) engine=aria ; show create table t1; Table Create Table @@ -682,7 +682,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; -# iteration 3 +# iteration 3b create table t1(a int) engine=aria ; show create table t1; Table Create Table @@ -698,7 +698,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; -# iteration 4 +# iteration 4b create table t1(a int) engine=aria ; show create table t1; Table Create Table @@ -714,7 +714,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Crashsafe: yes drop table t1; -# iteration 5 +# iteration 5b create table t1(a int) engine=aria ; show create table t1; Table Create Table @@ -730,7 +730,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; -# iteration 6 +# iteration 6b create table t1(a int) engine=aria ; show create table t1; Table Create Table @@ -746,7 +746,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; -# iteration 7 +# iteration 7b create table t1(a int) engine=aria transactional=0 ; show create table t1; Table Create Table @@ -762,7 +762,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; -# iteration 8 +# iteration 8b create table t1(a int) engine=aria transactional=0 ; show create table t1; Table Create Table @@ -778,7 +778,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; -# iteration 9 +# iteration 9b create table t1(a int) engine=aria transactional=0 ; show create table t1; Table Create Table @@ -794,7 +794,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; -# iteration 10 +# iteration 10b create table t1(a int) engine=aria transactional=0 ; show create table t1; Table Create Table @@ -810,7 +810,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; -# iteration 11 +# iteration 11b create table t1(a int) engine=aria transactional=0 ; show create table t1; Table Create Table @@ -826,7 +826,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; -# iteration 12 +# iteration 12b create table t1(a int) engine=aria transactional=0 ; show create table t1; Table Create Table @@ -842,7 +842,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; -# iteration 13 +# iteration 13b create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table @@ -858,7 +858,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; -# iteration 14 +# iteration 14b create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table @@ -874,7 +874,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; -# iteration 15 +# iteration 15b create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table @@ -890,7 +890,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; -# iteration 16 +# iteration 16b create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table @@ -906,7 +906,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; -# iteration 17 +# iteration 17b create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table @@ -922,7 +922,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; -# iteration 18 +# iteration 18b create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table diff --git a/mysql-test/suite/maria/maria-page-checksum.test b/mysql-test/suite/maria/maria-page-checksum.test index 8dd68fce245..d35e29634c6 100644 --- a/mysql-test/suite/maria/maria-page-checksum.test +++ b/mysql-test/suite/maria/maria-page-checksum.test @@ -19,7 +19,7 @@ select @@global.aria_page_checksum; # (first value of aria_page_checksum) x (clauses in CREATE TABLE) x # (second value of aria_page_checksum) x (clauses in ALTER TABLE). ---echo # iteration 1 +--echo # iteration 1a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -48,7 +48,7 @@ perl; EOF drop table t1; ---echo # iteration 2 +--echo # iteration 2a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -77,7 +77,7 @@ perl; EOF drop table t1; ---echo # iteration 3 +--echo # iteration 3a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -106,7 +106,7 @@ perl; EOF drop table t1; ---echo # iteration 4 +--echo # iteration 4a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -135,7 +135,7 @@ perl; EOF drop table t1; ---echo # iteration 5 +--echo # iteration 5a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -164,7 +164,7 @@ perl; EOF drop table t1; ---echo # iteration 6 +--echo # iteration 6a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -193,7 +193,7 @@ perl; EOF drop table t1; ---echo # iteration 7 +--echo # iteration 7a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -222,7 +222,7 @@ perl; EOF drop table t1; ---echo # iteration 8 +--echo # iteration 8a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -251,7 +251,7 @@ perl; EOF drop table t1; ---echo # iteration 9 +--echo # iteration 9a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -280,7 +280,7 @@ perl; EOF drop table t1; ---echo # iteration 10 +--echo # iteration 10a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -309,7 +309,7 @@ perl; EOF drop table t1; ---echo # iteration 11 +--echo # iteration 11a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -338,7 +338,7 @@ perl; EOF drop table t1; ---echo # iteration 12 +--echo # iteration 12a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -367,7 +367,7 @@ perl; EOF drop table t1; ---echo # iteration 13 +--echo # iteration 13a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -396,7 +396,7 @@ perl; EOF drop table t1; ---echo # iteration 14 +--echo # iteration 14a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -425,7 +425,7 @@ perl; EOF drop table t1; ---echo # iteration 15 +--echo # iteration 15a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -454,7 +454,7 @@ perl; EOF drop table t1; ---echo # iteration 16 +--echo # iteration 16a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -483,7 +483,7 @@ perl; EOF drop table t1; ---echo # iteration 17 +--echo # iteration 17a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -512,7 +512,7 @@ perl; EOF drop table t1; ---echo # iteration 18 +--echo # iteration 18a set global aria_page_checksum = 0 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -541,7 +541,7 @@ perl; EOF drop table t1; ---echo # iteration 19 +--echo # iteration 19a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -570,7 +570,7 @@ perl; EOF drop table t1; ---echo # iteration 20 +--echo # iteration 20a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -599,7 +599,7 @@ perl; EOF drop table t1; ---echo # iteration 21 +--echo # iteration 21a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -628,7 +628,7 @@ perl; EOF drop table t1; ---echo # iteration 22 +--echo # iteration 22a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -657,7 +657,7 @@ perl; EOF drop table t1; ---echo # iteration 23 +--echo # iteration 23a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -686,7 +686,7 @@ perl; EOF drop table t1; ---echo # iteration 24 +--echo # iteration 24a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -715,7 +715,7 @@ perl; EOF drop table t1; ---echo # iteration 25 +--echo # iteration 25a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -744,7 +744,7 @@ perl; EOF drop table t1; ---echo # iteration 26 +--echo # iteration 26a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -773,7 +773,7 @@ perl; EOF drop table t1; ---echo # iteration 27 +--echo # iteration 27a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -802,7 +802,7 @@ perl; EOF drop table t1; ---echo # iteration 28 +--echo # iteration 28a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -831,7 +831,7 @@ perl; EOF drop table t1; ---echo # iteration 29 +--echo # iteration 29a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -860,7 +860,7 @@ perl; EOF drop table t1; ---echo # iteration 30 +--echo # iteration 30a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; @@ -889,7 +889,7 @@ perl; EOF drop table t1; ---echo # iteration 31 +--echo # iteration 31a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -918,7 +918,7 @@ perl; EOF drop table t1; ---echo # iteration 32 +--echo # iteration 32a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -947,7 +947,7 @@ perl; EOF drop table t1; ---echo # iteration 33 +--echo # iteration 33a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -976,7 +976,7 @@ perl; EOF drop table t1; ---echo # iteration 34 +--echo # iteration 34a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -1005,7 +1005,7 @@ perl; EOF drop table t1; ---echo # iteration 35 +--echo # iteration 35a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -1034,7 +1034,7 @@ perl; EOF drop table t1; ---echo # iteration 36 +--echo # iteration 36a set global aria_page_checksum = 1 ; create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; @@ -1071,7 +1071,7 @@ drop table t1; # we scan through combinations in the cartesian product of # (clauses in CREATE TABLE) x (clauses in ALTER TABLE). ---echo # iteration 1 +--echo # iteration 1b create table t1(a int) engine=aria ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1098,7 +1098,7 @@ EOF drop table t1; ---echo # iteration 2 +--echo # iteration 2b create table t1(a int) engine=aria ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1125,7 +1125,7 @@ EOF drop table t1; ---echo # iteration 3 +--echo # iteration 3b create table t1(a int) engine=aria ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1152,7 +1152,7 @@ EOF drop table t1; ---echo # iteration 4 +--echo # iteration 4b create table t1(a int) engine=aria ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1179,7 +1179,7 @@ EOF drop table t1; ---echo # iteration 5 +--echo # iteration 5b create table t1(a int) engine=aria ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1206,7 +1206,7 @@ EOF drop table t1; ---echo # iteration 6 +--echo # iteration 6b create table t1(a int) engine=aria ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1233,7 +1233,7 @@ EOF drop table t1; ---echo # iteration 7 +--echo # iteration 7b create table t1(a int) engine=aria transactional=0 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1260,7 +1260,7 @@ EOF drop table t1; ---echo # iteration 8 +--echo # iteration 8b create table t1(a int) engine=aria transactional=0 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1287,7 +1287,7 @@ EOF drop table t1; ---echo # iteration 9 +--echo # iteration 9b create table t1(a int) engine=aria transactional=0 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1314,7 +1314,7 @@ EOF drop table t1; ---echo # iteration 10 +--echo # iteration 10b create table t1(a int) engine=aria transactional=0 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1341,7 +1341,7 @@ EOF drop table t1; ---echo # iteration 11 +--echo # iteration 11b create table t1(a int) engine=aria transactional=0 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1368,7 +1368,7 @@ EOF drop table t1; ---echo # iteration 12 +--echo # iteration 12b create table t1(a int) engine=aria transactional=0 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1395,7 +1395,7 @@ EOF drop table t1; ---echo # iteration 13 +--echo # iteration 13b create table t1(a int) engine=aria transactional=1 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1422,7 +1422,7 @@ EOF drop table t1; ---echo # iteration 14 +--echo # iteration 14b create table t1(a int) engine=aria transactional=1 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1449,7 +1449,7 @@ EOF drop table t1; ---echo # iteration 15 +--echo # iteration 15b create table t1(a int) engine=aria transactional=1 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1476,7 +1476,7 @@ EOF drop table t1; ---echo # iteration 16 +--echo # iteration 16b create table t1(a int) engine=aria transactional=1 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1503,7 +1503,7 @@ EOF drop table t1; ---echo # iteration 17 +--echo # iteration 17b create table t1(a int) engine=aria transactional=1 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt @@ -1530,7 +1530,7 @@ EOF drop table t1; ---echo # iteration 18 +--echo # iteration 18b create table t1(a int) engine=aria transactional=1 ; show create table t1; --exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt diff --git a/mysql-test/suite/maria/maria-partitioning.result b/mysql-test/suite/maria/maria-partitioning.result index bcb88626ff7..ad5de7952c7 100644 --- a/mysql-test/suite/maria/maria-partitioning.result +++ b/mysql-test/suite/maria/maria-partitioning.result @@ -2,8 +2,8 @@ set global storage_engine=aria; set session storage_engine=aria; DROP TABLE if exists t1,t2; Warnings: -Note 1051 Unknown table 't1' -Note 1051 Unknown table 't2' +Note 1051 Unknown table 'test.t1' +Note 1051 Unknown table 'test.t2' create table t2(a blob) engine=aria; create table t1(a int primary key) engine=aria; insert into t2 values ('foo'),('bar'); diff --git a/mysql-test/suite/maria/maria-ucs2.result b/mysql-test/suite/maria/maria-ucs2.result index e7258f21d4f..fab640f703a 100644 --- a/mysql-test/suite/maria/maria-ucs2.result +++ b/mysql-test/suite/maria/maria-ucs2.result @@ -17,7 +17,6 @@ test.t1 check status OK ALTER TABLE t1 MODIFY a VARCHAR(800) CHARSET `ucs2`; Warnings: Warning 1071 Specified key was too long; max key length is 1000 bytes -Warning 1071 Specified key was too long; max key length is 1000 bytes CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK diff --git a/mysql-test/suite/maria/maria3.result b/mysql-test/suite/maria/maria3.result index 2aad2f5cc75..021cc8fc357 100644 --- a/mysql-test/suite/maria/maria3.result +++ b/mysql-test/suite/maria/maria3.result @@ -460,7 +460,7 @@ id f1 1 test1 2 test2 drop table t1; -SET SQL_MODE = 'TRADITIONAL'; +SET SQL_MODE = ''; create table t1 (n int not null primary key auto_increment, c char(1), unique(c)); insert into t1 values(100, "a"); insert into t1 values(300, "b"); diff --git a/mysql-test/suite/maria/maria3.test b/mysql-test/suite/maria/maria3.test index f1d95a15ba5..b4e3e30d63f 100644 --- a/mysql-test/suite/maria/maria3.test +++ b/mysql-test/suite/maria/maria3.test @@ -364,7 +364,7 @@ INSERT IGNORE INTO t1 (f1) VALUES ("test1"); INSERT IGNORE INTO t1 (f1) VALUES ("test2"); SELECT * FROM t1; drop table t1; -SET SQL_MODE = 'TRADITIONAL'; +SET SQL_MODE = ''; create table t1 (n int not null primary key auto_increment, c char(1), unique(c)); insert into t1 values(100, "a"); diff --git a/mysql-test/suite/maria/max_length.result b/mysql-test/suite/maria/max_length.result index 6db58622698..049b92eafe5 100644 --- a/mysql-test/suite/maria/max_length.result +++ b/mysql-test/suite/maria/max_length.result @@ -1,7 +1,7 @@ drop table if exists t1,t2; Warnings: -Note 1051 Unknown table 't1' -Note 1051 Unknown table 't2' +Note 1051 Unknown table 'test.t1' +Note 1051 Unknown table 'test.t2' create table t1 (id int(10) unsigned not null auto_increment primary key, v varchar(1000), b blob) row_format=page max_rows=2 engine=aria; create table t2 (id int(10) unsigned not null auto_increment primary key, v varchar(1000), b blob) row_format=page max_rows=20000000 engine=aria; lock tables t1 write,t2 write; diff --git a/mysql-test/suite/maria/small_blocksize.result b/mysql-test/suite/maria/small_blocksize.result index f418a1f92ef..940a718d34e 100644 --- a/mysql-test/suite/maria/small_blocksize.result +++ b/mysql-test/suite/maria/small_blocksize.result @@ -1,6 +1,6 @@ DROP TABLE if exists t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' CREATE TABLE t1 (col_longtext_ucs2 longtext, col_longtext_utf8 longtext, col_varchar_255_ucs2_key varchar(255), col_set_utf8 set ('a','b'), col_char_255_ucs2 char(255), col_char_255_ucs2_key char(255), col_enum_ucs2 enum ('a','b'), col_varchar_255_ucs2 varchar(255), col_longtext_ucs2_key longtext, col_longtext_utf8_key longtext, col_enum_utf8 enum ('a','b'), col_varchar_255_utf8_key varchar(1024), col_varchar_255_utf8 varchar(255), col_enum_ucs2_key enum ('a','b'), col_enum_utf8_key enum ('a','b'), col_set_utf8_key set ('a','b'), col_char_255_utf8 char(255), pk integer auto_increment, col_set_ucs2_key set ('a','b'), col_char_255_utf8_key char(255), col_set_ucs2 set ('a','b'), primary key (pk)) ENGINE=aria; INSERT INTO t1 ( col_char_255_utf8, col_varchar_255_utf8_key, col_longtext_utf8_key ) VALUES ( 'lggnqojgqectqlkvskffihliqcwoakzzzjvhkqlwjybkngdbubskflpmzegdrk', REPEAT( 'a', 627 ), 'mlggnqojgqectqlkvskffihliqcwoakzzzjvhkqlwjybkngdbubskflpmzegdrklnipcmzbtwdqfnyinqfohgtiwmvfpbuslgobjhslxnaybcyebhsrlipnuvalhmvhlwbwujtvjsdrbyapfzprnxfgtrukwhywtkaoupsaogxsjxhqjkidvnpeytjgndtnrrbm' ); UPDATE t1 SET col_varchar_255_utf8 = REPEAT('a', 197 ); |