rename maria to aria

4 files changed, 31 insertions, 30 deletions

diff --git a/mysql-test/include/have_maria.inc b/mysql-test/include/have_maria.inc
index 474e9db12b9..82725beb1e0 100644
--- a/mysql-test/include/have_maria.inc
+++ b/mysql-test/include/have_maria.inc
@@ -1,4 +1,5 @@
-disable_query_log;
---require r/true.require
-select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'maria';
-enable_query_log;
+if (!`SELECT count(*) FROM information_schema.engines WHERE
+      (support = 'YES' OR support = 'DEFAULT') AND
+      engine = 'aria'`){
+  skip Need Aria engine;
+}
diff --git a/mysql-test/include/maria_empty_logs.inc b/mysql-test/include/maria_empty_logs.inc
index cc93e214348..05ecfc4982c 100644
--- a/mysql-test/include/maria_empty_logs.inc
+++ b/mysql-test/include/maria_empty_logs.inc
@@ -27,52 +27,52 @@ EOF
 if (!$mel_keep_control_file)
 {
   --error 0,1
-  remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control;
+  remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control;
 }
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000001;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000001;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000002;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000002;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000003;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000003;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000004;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000004;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000005;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000005;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000006;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000006;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000007;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000007;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000008;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000008;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000009;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000009;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000010;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000010;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000011;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000011;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000012;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000012;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000013;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000013;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000014;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000014;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000015;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000015;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000016;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000016;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000017;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000017;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000018;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000018;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000019;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000019;
 -- error 0,1
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000020;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000020;
 # hope there are not more than these logs...
 
 -- error 0,1
-remove_file $MYSQLD_DATADIR/maria_recovery.trace;
+remove_file $MYSQLD_DATADIR/aria_recovery.trace;
 
 append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
 restart-maria_empty_logs.inc
diff --git a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
index 62f5250cab4..6111dacc8f3 100644
--- a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
+++ b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
@@ -32,7 +32,7 @@ let $mms_copy=0;
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 -- error 0,1
-remove_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.maria_log_control;
-copy_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.maria_log_control;
+remove_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.aria_log_control;
+copy_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.aria_log_control;
 
 connection default;
diff --git a/mysql-test/include/maria_verify_recovery.inc b/mysql-test/include/maria_verify_recovery.inc
index e8354c43837..71292947c80 100644
--- a/mysql-test/include/maria_verify_recovery.inc
+++ b/mysql-test/include/maria_verify_recovery.inc
@@ -56,8 +56,8 @@ if ($mvr_restore_old_snapshot)
   # also copy back control file, to force recovery to start from an early
   # point, ignoring further checkpoints.
   -- error 0,1
-  remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control;
-  copy_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.maria_log_control $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control;
+  remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control;
+  copy_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.aria_log_control $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control;
 }
 
 --echo * recovery happens