summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria/t
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/maria/t')
-rw-r--r--mysql-test/suite/maria/t/maria-autozerofill.test7
-rw-r--r--mysql-test/suite/maria/t/maria-big.test2
-rw-r--r--mysql-test/suite/maria/t/maria-connect.test2
-rw-r--r--mysql-test/suite/maria/t/maria-page-checksum.test220
-rw-r--r--mysql-test/suite/maria/t/maria-purge.test16
-rw-r--r--mysql-test/suite/maria/t/maria-recover.test18
-rw-r--r--mysql-test/suite/maria/t/maria-recovery-rtree-ft.test6
-rw-r--r--mysql-test/suite/maria/t/maria-recovery2.test3
-rw-r--r--mysql-test/suite/maria/t/maria-recovery3.test5
-rw-r--r--mysql-test/suite/maria/t/maria.test11
-rw-r--r--mysql-test/suite/maria/t/maria2.test4
-rw-r--r--mysql-test/suite/maria/t/maria3.test6
-rw-r--r--mysql-test/suite/maria/t/maria_notembedded.test1
-rw-r--r--mysql-test/suite/maria/t/maria_partition.test24
-rw-r--r--mysql-test/suite/maria/t/maria_showlog_error.test3
-rw-r--r--mysql-test/suite/maria/t/ps_maria.test1
16 files changed, 183 insertions, 146 deletions
diff --git a/mysql-test/suite/maria/t/maria-autozerofill.test b/mysql-test/suite/maria/t/maria-autozerofill.test
index 1ad3464206b..45eb39fbc21 100644
--- a/mysql-test/suite/maria/t/maria-autozerofill.test
+++ b/mysql-test/suite/maria/t/maria-autozerofill.test
@@ -24,7 +24,8 @@ create table t1(a int) engine=maria;
insert into t1 values(1);
flush table t1;
# Check that table is not zerofilled, not movable
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+let $MYSQLD_DATADIR= `select @@datadir`;
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -48,7 +49,7 @@ enable_ps_protocol;
flush table t1;
# Check that table is auto-zerofilled, movable
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -65,7 +66,7 @@ insert into t1 values(2);
flush table t1;
# Check that table is not zerofilled, not movable
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
diff --git a/mysql-test/suite/maria/t/maria-big.test b/mysql-test/suite/maria/t/maria-big.test
index d664dc05095..612cdbabb81 100644
--- a/mysql-test/suite/maria/t/maria-big.test
+++ b/mysql-test/suite/maria/t/maria-big.test
@@ -2,6 +2,7 @@
--source include/have_maria.inc
--source include/big_test.inc
+let $default_max_allowed_packet=`select @@global.max_allowed_packet`;
set global max_allowed_packet=400000000;
# need new session to use setting above
connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
@@ -9,7 +10,6 @@ connection root;
enable_info;
set storage_engine=maria;
-set global maria_log_file_size=4294967295;
disable_warnings;
drop table if exists t1, t2;
enable_warnings;
diff --git a/mysql-test/suite/maria/t/maria-connect.test b/mysql-test/suite/maria/t/maria-connect.test
index f34f319a388..31b15b1f8f1 100644
--- a/mysql-test/suite/maria/t/maria-connect.test
+++ b/mysql-test/suite/maria/t/maria-connect.test
@@ -9,8 +9,6 @@ let $default=`select @@global.storage_engine`;
set global storage_engine=maria;
set session storage_engine=maria;
-set global maria_log_file_size=4294967295;
-
# Initialise
--disable_warnings
drop table if exists t1;
diff --git a/mysql-test/suite/maria/t/maria-page-checksum.test b/mysql-test/suite/maria/t/maria-page-checksum.test
index 3283a5c3c28..9b05b00a371 100644
--- a/mysql-test/suite/maria/t/maria-page-checksum.test
+++ b/mysql-test/suite/maria/t/maria-page-checksum.test
@@ -11,6 +11,8 @@ drop table if exists t1;
# Test for BUG#35441 "Cannot change PAGE_CHECKSUM table option"
#
+let $MYSQLD_DATADIR= `select @@datadir`;
+
select @@global.maria_page_checksum;
# we scan through combinations in the cartesian product of
@@ -21,7 +23,7 @@ select @@global.maria_page_checksum;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -34,7 +36,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -50,7 +52,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -63,7 +65,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -79,7 +81,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -92,7 +94,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -108,7 +110,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -121,7 +123,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -137,7 +139,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -150,7 +152,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -166,7 +168,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -179,7 +181,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -195,7 +197,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -208,7 +210,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -224,7 +226,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -237,7 +239,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -253,7 +255,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -266,7 +268,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -282,7 +284,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -295,7 +297,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -311,7 +313,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -324,7 +326,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -340,7 +342,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -353,7 +355,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -369,7 +371,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -382,7 +384,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -398,7 +400,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -411,7 +413,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -427,7 +429,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -440,7 +442,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -456,7 +458,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -469,7 +471,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -485,7 +487,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -498,7 +500,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -514,7 +516,7 @@ drop table t1;
set global maria_page_checksum = 0 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -527,7 +529,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -543,7 +545,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -556,7 +558,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -572,7 +574,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -585,7 +587,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -601,7 +603,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -614,7 +616,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -630,7 +632,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -643,7 +645,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -659,7 +661,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -672,7 +674,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -688,7 +690,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -701,7 +703,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -717,7 +719,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -730,7 +732,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -746,7 +748,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -759,7 +761,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -775,7 +777,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -788,7 +790,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -804,7 +806,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -817,7 +819,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -833,7 +835,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -846,7 +848,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -862,7 +864,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -875,7 +877,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -891,7 +893,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -904,7 +906,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -920,7 +922,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -933,7 +935,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -949,7 +951,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -962,7 +964,7 @@ EOF
set global maria_page_checksum = 0 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -978,7 +980,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -991,7 +993,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 engine=maria ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1007,7 +1009,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1020,7 +1022,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=0 ;
show create table t1 /* expecting PAGE_CHECKSUM=0 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1036,7 +1038,7 @@ drop table t1;
set global maria_page_checksum = 1 ;
create table t1(a int) engine=maria PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1049,7 +1051,7 @@ EOF
set global maria_page_checksum = 1 ;
alter table t1 PAGE_CHECKSUM=1 ;
show create table t1 /* expecting PAGE_CHECKSUM=1 */ ;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1072,7 +1074,7 @@ drop table t1;
--echo # iteration 1
create table t1(a int) engine=maria ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1084,7 +1086,7 @@ EOF
alter table t1 modify a bigint ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1099,7 +1101,7 @@ drop table t1;
--echo # iteration 2
create table t1(a int) engine=maria ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1111,7 +1113,7 @@ EOF
alter table t1 transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1126,7 +1128,7 @@ drop table t1;
--echo # iteration 3
create table t1(a int) engine=maria ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1138,7 +1140,7 @@ EOF
alter table t1 transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1153,7 +1155,7 @@ drop table t1;
--echo # iteration 4
create table t1(a int) engine=maria ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1165,7 +1167,7 @@ EOF
alter table t1 engine=maria ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1180,7 +1182,7 @@ drop table t1;
--echo # iteration 5
create table t1(a int) engine=maria ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1192,7 +1194,7 @@ EOF
alter table t1 engine=maria transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1207,7 +1209,7 @@ drop table t1;
--echo # iteration 6
create table t1(a int) engine=maria ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1219,7 +1221,7 @@ EOF
alter table t1 engine=maria transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1234,7 +1236,7 @@ drop table t1;
--echo # iteration 7
create table t1(a int) engine=maria transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1246,7 +1248,7 @@ EOF
alter table t1 modify a bigint ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1261,7 +1263,7 @@ drop table t1;
--echo # iteration 8
create table t1(a int) engine=maria transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1273,7 +1275,7 @@ EOF
alter table t1 transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1288,7 +1290,7 @@ drop table t1;
--echo # iteration 9
create table t1(a int) engine=maria transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1300,7 +1302,7 @@ EOF
alter table t1 transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1315,7 +1317,7 @@ drop table t1;
--echo # iteration 10
create table t1(a int) engine=maria transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1327,7 +1329,7 @@ EOF
alter table t1 engine=maria ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1342,7 +1344,7 @@ drop table t1;
--echo # iteration 11
create table t1(a int) engine=maria transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1354,7 +1356,7 @@ EOF
alter table t1 engine=maria transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1369,7 +1371,7 @@ drop table t1;
--echo # iteration 12
create table t1(a int) engine=maria transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1381,7 +1383,7 @@ EOF
alter table t1 engine=maria transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1396,7 +1398,7 @@ drop table t1;
--echo # iteration 13
create table t1(a int) engine=maria transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1408,7 +1410,7 @@ EOF
alter table t1 modify a bigint ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1423,7 +1425,7 @@ drop table t1;
--echo # iteration 14
create table t1(a int) engine=maria transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1435,7 +1437,7 @@ EOF
alter table t1 transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1450,7 +1452,7 @@ drop table t1;
--echo # iteration 15
create table t1(a int) engine=maria transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1462,7 +1464,7 @@ EOF
alter table t1 transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1477,7 +1479,7 @@ drop table t1;
--echo # iteration 16
create table t1(a int) engine=maria transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1489,7 +1491,7 @@ EOF
alter table t1 engine=maria ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1504,7 +1506,7 @@ drop table t1;
--echo # iteration 17
create table t1(a int) engine=maria transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1516,7 +1518,7 @@ EOF
alter table t1 engine=maria transactional=0 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1531,7 +1533,7 @@ drop table t1;
--echo # iteration 18
create table t1(a int) engine=maria transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1543,7 +1545,7 @@ EOF
alter table t1 engine=maria transactional=1 ;
show create table t1;
---exec $MARIA_CHK -dv $MYSQLTEST_VARDIR/mysqld.1/data/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
perl;
use strict;
use warnings;
@@ -1553,5 +1555,3 @@ perl;
close FILE;
EOF
drop table t1;
-
-
diff --git a/mysql-test/suite/maria/t/maria-purge.test b/mysql-test/suite/maria/t/maria-purge.test
index d30b71ae6ea..0aa720543f6 100644
--- a/mysql-test/suite/maria/t/maria-purge.test
+++ b/mysql-test/suite/maria/t/maria-purge.test
@@ -64,19 +64,19 @@ insert into t1 select * from t2;
set global maria_log_file_size=16777216;
# force a checkpoint to allow log purge
eval set global maria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+data/data/
+--replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
SHOW ENGINE maria logs;
insert into t2 select * from t1;
insert into t1 select * from t2;
eval set global maria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+data/data/
+--replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
SHOW ENGINE maria logs;
set global maria_log_file_size=16777216;
select @@global.maria_log_file_size;
eval set global maria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+data/data/
+--replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
SHOW ENGINE maria logs;
set global maria_log_file_size=8388608;
select @@global.maria_log_file_size;
@@ -84,26 +84,26 @@ select @@global.maria_log_file_size;
set global maria_log_purge_type=at_flush;
insert into t1 select * from t2;
eval set global maria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+data/data/
+--replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
SHOW ENGINE maria logs;
flush logs;
---replace_regex /Size +[0-9]+ ; .+data/data/
+--replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
SHOW ENGINE maria logs;
set global maria_log_file_size=16777216;
set global maria_log_purge_type=external;
insert into t1 select * from t2;
eval set global maria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+data/data/
+--replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
SHOW ENGINE maria logs;
flush logs;
---replace_regex /Size +[0-9]+ ; .+data/data/
+--replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
SHOW ENGINE maria logs;
set global maria_log_purge_type=immediate;
insert into t1 select * from t2;
eval set global maria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+data/data/
+--replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
SHOW ENGINE maria logs;
drop table t1, t2;
diff --git a/mysql-test/suite/maria/t/maria-recover.test b/mysql-test/suite/maria/t/maria-recover.test
index de085d3ee8f..b9cec2eadf1 100644
--- a/mysql-test/suite/maria/t/maria-recover.test
+++ b/mysql-test/suite/maria/t/maria-recover.test
@@ -2,6 +2,14 @@
--source include/have_maria.inc
+call mtr.add_suppression("Checking table: '.\/mysqltest\/t_corrupted2'");
+call mtr.add_suppression("Recovering table: '.\/mysqltest\/t_corrupted2'");
+call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted2' is marked as crashed and should be repaired");
+
+# Note: we're setting an environment variable (not prefixing it by $),
+# so that the perl code below can access it.
+let MYSQLD_DATADIR= `select @@datadir`;
+
select @@global.maria_recover;
set global maria_recover=off;
select @@global.maria_recover;
@@ -28,9 +36,9 @@ insert into t1 select concat(a,'b') from t1 limit 1;
# a specific name to do specific detection (don't want to ignore
# any corruption messages of other tests using "t2" as table).
-copy_file $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t1.frm $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t_corrupted2.frm;
-copy_file $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t1.MAD $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t_corrupted2.MAD;
-copy_file $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t1.MAI $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t_corrupted2.MAI;
+copy_file $MYSQLD_DATADIR/mysqltest/t1.frm $MYSQLD_DATADIR/mysqltest/t_corrupted2.frm;
+copy_file $MYSQLD_DATADIR/mysqltest/t1.MAD $MYSQLD_DATADIR/mysqltest/t_corrupted2.MAD;
+copy_file $MYSQLD_DATADIR/mysqltest/t1.MAI $MYSQLD_DATADIR/mysqltest/t_corrupted2.MAI;
# Ruin the index file.
# If maria-block-size is smaller than the default, the corruption
@@ -38,7 +46,7 @@ copy_file $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t1.MAI $MYSQLTEST_VARDIR/mys
perl;
use strict;
use warnings;
- my $fname= "$ENV{'MYSQLTEST_VARDIR'}/mysqld.1/data/mysqltest/t_corrupted2.MAI";
+ my $fname= "$ENV{'MYSQLD_DATADIR'}/mysqltest/t_corrupted2.MAI";
open(FILE, "+<", $fname) or die;
my $whatever= ("\xAB" x 100);
sysseek (FILE, 8192, 0) or die;
@@ -54,4 +62,4 @@ enable_ps_protocol;
select * from t_corrupted2; # should show just rows
drop database mysqltest;
-set @@global.maria_recover=BACKUP;
+set global maria_recover=backup;
diff --git a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
index f66d3d8a4a4..3ede5002b72 100644
--- a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
+++ b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
@@ -209,9 +209,9 @@ select count(*) from t2;
-- source include/maria_verify_recovery.inc
-let $mms_purpose=comparison;
-eval drop database mysqltest_for_$mms_purpose;
+# clean up everything
let $mms_purpose=feeding_recovery;
eval drop database mysqltest_for_$mms_purpose;
+let $mms_purpose=comparison;
+eval drop database mysqltest_for_$mms_purpose;
drop database mysqltest;
-
diff --git a/mysql-test/suite/maria/t/maria-recovery2.test b/mysql-test/suite/maria/t/maria-recovery2.test
index 0ab66f8fa35..017256a5ec8 100644
--- a/mysql-test/suite/maria/t/maria-recovery2.test
+++ b/mysql-test/suite/maria/t/maria-recovery2.test
@@ -5,6 +5,9 @@
--source include/have_debug.inc
--source include/have_maria.inc
+call mtr.add_suppression("File '.*maria_log.000.*' not found \\(Errcode: 2\\)");
+call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with maria_chk -r");
+
set global maria_log_file_size=4294967295;
let $MARIA_LOG=../../tmp;
diff --git a/mysql-test/suite/maria/t/maria-recovery3.test b/mysql-test/suite/maria/t/maria-recovery3.test
index a08267070d0..a241473f457 100644
--- a/mysql-test/suite/maria/t/maria-recovery3.test
+++ b/mysql-test/suite/maria/t/maria-recovery3.test
@@ -109,10 +109,9 @@ truncate table t1;
check table t1 extended;
drop table t1;
-
# clean up everything
-let $mms_purpose=comparison;
-eval drop database mysqltest_for_$mms_purpose;
let $mms_purpose=feeding_recovery;
eval drop database mysqltest_for_$mms_purpose;
+let $mms_purpose=comparison;
+eval drop database mysqltest_for_$mms_purpose;
drop database mysqltest;
diff --git a/mysql-test/suite/maria/t/maria.test b/mysql-test/suite/maria/t/maria.test
index 6aeb80cbf39..c40dde5952b 100644
--- a/mysql-test/suite/maria/t/maria.test
+++ b/mysql-test/suite/maria/t/maria.test
@@ -13,6 +13,7 @@ let $default_checksum=`select @@global.maria_page_checksum`;
set global storage_engine=maria;
set session storage_engine=maria;
set global maria_page_checksum=0;
+let $default_log_file_size=`select @@global.maria_log_file_size`;
set global maria_log_file_size=4294967295;
# Initialise
@@ -1406,8 +1407,9 @@ CREATE TABLE t1 (
KEY (c1),
KEY (c2)
) ENGINE=maria DEFAULT CHARSET=utf8 PACK_KEYS=0;
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---exec $MARIA_CHK -d $MYSQLTEST_VARDIR/mysqld.1/data/test/t1
+let $MYSQLD_DATADIR= `select @@datadir`;
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
+--exec $MARIA_CHK -d $MYSQLD_DATADIR/test/t1
DROP TABLE t1;
# Test warnings with transactional=1 with MyISAM
@@ -1874,7 +1876,8 @@ drop table t1;
# Set defaults back
--disable_result_log
--disable_query_log
-eval set global storage_engine=$default_engine, maria_page_checksum=$default_checksum;
-set global maria_log_file_size=default;
+eval set global storage_engine=$default_engine,
+maria_page_checksum=$default_checksum,
+maria_log_file_size=$default_log_file_size;
--enable_result_log
--enable_query_log
diff --git a/mysql-test/suite/maria/t/maria2.test b/mysql-test/suite/maria/t/maria2.test
index 3dd35697a1f..45155ab9cae 100644
--- a/mysql-test/suite/maria/t/maria2.test
+++ b/mysql-test/suite/maria/t/maria2.test
@@ -103,8 +103,8 @@ drop table t1;
# test LOAD DATA INFILE REPLACE
create table t1 (pk int primary key, apk int unique, data int) engine=maria;
insert into t1 values (1, 1, 1), (4, 4, 4), (6, 6, 6);
-load data concurrent infile '../../../std_data/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk);
+load data concurrent infile '../../std_data/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk);
select * from t1 order by pk;
-load data infile '../../../std_data/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk);
+load data infile '../../std_data/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk);
select * from t1 order by pk;
drop table t1;
diff --git a/mysql-test/suite/maria/t/maria3.test b/mysql-test/suite/maria/t/maria3.test
index eeb3706fed3..992754cc11f 100644
--- a/mysql-test/suite/maria/t/maria3.test
+++ b/mysql-test/suite/maria/t/maria3.test
@@ -7,6 +7,7 @@ let $default_checksum=`select @@global.maria_page_checksum`;
set global storage_engine=maria;
set session storage_engine=maria;
set global maria_page_checksum=0;
+let $default_log_file_size=`select @@global.maria_log_file_size`;
set global maria_log_file_size=4294967295;
# Initialise
@@ -483,7 +484,8 @@ drop table t1, t2;
--disable_result_log
--disable_query_log
-eval set global storage_engine=$default_engine, maria_page_checksum=$default_checksum;
-set global maria_log_file_size=default;
+eval set global storage_engine=$default_engine,
+maria_page_checksum=$default_checksum,
+maria_log_file_size=$default_log_file_size;
--enable_result_log
--enable_query_log
diff --git a/mysql-test/suite/maria/t/maria_notembedded.test b/mysql-test/suite/maria/t/maria_notembedded.test
index afa749a653d..0f27802de27 100644
--- a/mysql-test/suite/maria/t/maria_notembedded.test
+++ b/mysql-test/suite/maria/t/maria_notembedded.test
@@ -89,6 +89,7 @@ unlock tables;
disconnect con_d;
connection default;
+check table t1;
drop table t1;
--disable_result_log
diff --git a/mysql-test/suite/maria/t/maria_partition.test b/mysql-test/suite/maria/t/maria_partition.test
index 4e99735f9a8..ced87903c21 100644
--- a/mysql-test/suite/maria/t/maria_partition.test
+++ b/mysql-test/suite/maria/t/maria_partition.test
@@ -8,7 +8,6 @@ let $default_checksum=`select @@global.maria_page_checksum`;
set global storage_engine=maria;
set session storage_engine=maria;
set global maria_page_checksum=0;
-set global maria_log_file_size=4294967295;
# Initialise
--disable_warnings
@@ -27,6 +26,29 @@ insert into t1 values (1);
alter table t1 partition by list (s1) (partition p1 values in (2));
drop table t1;
+#
+# Test outer join const propagation
+#
+create table t2(a blob) engine=maria;
+create table t1(a int primary key) engine=maria;
+insert into t2 values ('foo'),('bar');
+select * from t2 left join t1 on (t2.a=t1.a) where t2.a='bbb';
+insert into t1 values (1);
+select * from t2 left join t1 on (t2.a=t1.a) where t2.a='bbb';
+insert into t1 values (2);
+select * from t2 left join t1 on (t2.a=t1.a) where t2.a='bbb';
+drop table t1,t2;
+
+create table t2(a blob);
+create table t1(a int primary key) PARTITION BY HASH (a) PARTITIONS 2;
+insert into t2 values ('foo'),('bar');
+select * from t2 left join t1 on (t2.a=t1.a) where t2.a='bbb';
+insert into t1 values (1);
+select * from t2 left join t1 on (t2.a=t1.a) where t2.a='bbb';
+insert into t1 values (2);
+select * from t2 left join t1 on (t2.a=t1.a) where t2.a='bbb';
+drop table t1,t2;
+
# Set defaults back
--disable_result_log
--disable_query_log
diff --git a/mysql-test/suite/maria/t/maria_showlog_error.test b/mysql-test/suite/maria/t/maria_showlog_error.test
index c1e776fb085..9c4d5b8ef2c 100644
--- a/mysql-test/suite/maria/t/maria_showlog_error.test
+++ b/mysql-test/suite/maria/t/maria_showlog_error.test
@@ -18,7 +18,8 @@ connection default;
connection default;
-remove_file $MYSQLTEST_VARDIR/mysqld.1/data/$MARIA_LOG/maria_log.00000001;
+let MYSQLD_DATADIR= `select @@datadir`;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000001;
--replace_regex /Size unknown ; .*maria_log.00000001/Size unknown ; maria_log.00000001/
show engine maria logs;
diff --git a/mysql-test/suite/maria/t/ps_maria.test b/mysql-test/suite/maria/t/ps_maria.test
index 29ebcfed5b2..34960d90f8f 100644
--- a/mysql-test/suite/maria/t/ps_maria.test
+++ b/mysql-test/suite/maria/t/ps_maria.test
@@ -9,7 +9,6 @@
# BEFORE ADDING NEW TEST CASES HERE !!!
-- source include/have_maria.inc
-set global maria_log_file_size=4294967295;
use test;
View Lorry Controller Status