fix for maria.maria test

3 files changed, 114 insertions, 109 deletions

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/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 24a6eb2ba80..1c37c4f811d 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -3210,11 +3210,16 @@ bool ha_maria::check_if_incompatible_data(HA_CREATE_INFO *create_info,
 {
   DBUG_ENTER("check_if_incompatible_data");
   uint options= table->s->db_options_in_use;
+  enum ha_choice page_checksum= table->s->page_checksum;
+
+  if (page_checksum == HA_CHOICE_UNDEF)
+    page_checksum= file->s->options & HA_OPTION_PAGE_CHECKSUM ? HA_CHOICE_YES
+                                                              : HA_CHOICE_NO;
 
   if (create_info->auto_increment_value != stats.auto_increment_value ||
       create_info->data_file_name != data_file_name ||
       create_info->index_file_name != index_file_name ||
-      create_info->page_checksum != table->s->page_checksum ||
+      create_info->page_checksum != page_checksum ||
       create_info->transactional != table->s->transactional ||
       (maria_row_type(create_info) != data_file_type &&
        create_info->row_type != ROW_TYPE_DEFAULT) ||