diff options
| author | Monty <monty@mariadb.org> | 2019-05-13 12:57:26 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-05-13 13:59:41 +0300 |
| commit | 60518a6b85e48c92ec779358a9f83399c1e59786 (patch) | |
| tree | b1e611cf8457a16689ce8c62440cccffee45276f | |
| parent | 6a365e0bf212cd11001a0dad1e51fd6020905301 (diff) | |
| download | mariadb-git-60518a6b85e48c92ec779358a9f83399c1e59786.tar.gz | |
Make maria-autozerofill a bit more rebust
- Remove warning about aria_control_file
- Write to unique test file
Other things:
- Fixed typo in aria_chk --help
| -rw-r--r-- | mysql-test/suite/maria/maria-autozerofill.test | 14 | ||||
| -rw-r--r-- | storage/maria/maria_chk.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/suite/maria/maria-autozerofill.test b/mysql-test/suite/maria/maria-autozerofill.test index e56f71d2c5f..4baa118302c 100644 --- a/mysql-test/suite/maria/maria-autozerofill.test +++ b/mysql-test/suite/maria/maria-autozerofill.test @@ -39,11 +39,11 @@ flush tables; # Check that table is not zerofilled, not movable let $MYSQLD_DATADIR= `select @@datadir`; ---exec $MARIA_CHK -dv --ignore-control-file $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt +--exec $MARIA_CHK -dv --ignore-control-file $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/autozerofill.txt perl; use strict; use warnings; - my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/ariachk.txt"; + my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/autozerofill.txt"; open(FILE, "<", $fname) or die; my @content= <FILE>; print grep(/Status:.*(zerofilled|movable)/, @content); @@ -64,11 +64,11 @@ enable_ps_protocol; flush table t1; # Check that table is auto-zerofilled, movable ---exec $MARIA_CHK -dv --ignore-control-file $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt +--exec $MARIA_CHK -dv --ignore-control-file $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/autozerofill.txt perl; use strict; use warnings; - my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/ariachk.txt"; + my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/autozerofill.txt"; open(FILE, "<", $fname) or die; my @content= <FILE>; print grep(/Status:.*zerofilled/, @content); @@ -81,11 +81,11 @@ insert into t1 values(2); flush table t1; # Check that table is not zerofilled, not movable ---exec $MARIA_CHK -dv --ignore-control-file $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt +--exec $MARIA_CHK -dv --ignore-control-file $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/autozerofill.txt perl; use strict; use warnings; - my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/ariachk.txt"; + my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/autozerofill.txt"; open(FILE, "<", $fname) or die; my @content= <FILE>; print grep(/Status:.*(zerofilled|movable)/, @content); @@ -115,7 +115,7 @@ check table t5; # Check that if we zerofill with aria_chk, we should not get any warnings when # accessing the table ---exec $MARIA_CHK --zerofill $MYSQLD_DATADIR/mysqltest/t6 >$MYSQLTEST_VARDIR/tmp/ariachk.txt +--exec $MARIA_CHK --ignore-control-file --zerofill $MYSQLD_DATADIR/mysqltest/t6 >$MYSQLTEST_VARDIR/tmp/autozerofill.txt 2>&1 select * from t6; check table t6; diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index 43798fe8c07..7462165324b 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -490,7 +490,7 @@ static void usage(void) --ignore-control-file Don't open the control file. Only use this if you\n\ are sure the tables are not in use by another\n\ program!\n\ - --require-control-file Abort if we can't find/read the maria_log_control\n\ + --require-control-file Abort if we can't find/read the aria_log_control\n\ file\n\ -s, --silent Only print errors. One can use two -s to make\n\ maria_chk very silent.\n\ |