rename maria to aria

.bzrignore

@@ -1470,15 +1470,15 @@ storage/maria/ma_test1
 storage/maria/ma_test2
 storage/maria/ma_test3
 storage/maria/ma_test_all
-storage/maria/maria.log
+storage/maria/aria.log
-storage/maria/maria_chk
+storage/maria/aria_chk
-storage/maria/maria_control
+storage/maria/aria_control
-storage/maria/maria_dump_log
+storage/maria/aria_dump_log
-storage/maria/maria_ftdump
+storage/maria/aria_ftdump
-storage/maria/maria_log
+storage/maria/aria_log
-storage/maria/maria_log.*
+storage/maria/aria_log.*
-storage/maria/maria_pack
+storage/maria/aria_pack
-storage/maria/maria_read_log
+storage/maria/aria_read_log
 storage/maria/tmp
 storage/maria/tmp/*
 storage/maria/unittest/ma_pagecache_consist_1k-t-big

BUILD/SETUP.sh

@@ -163,7 +163,7 @@ base_configs="--prefix=$prefix --enable-assembler "
 base_configs="$base_configs --with-extra-charsets=complex "
 base_configs="$base_configs --enable-thread-safe-client "
 base_configs="$base_configs --with-big-tables"
-base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables --without-plugin-innodb_plugin"
+base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables --without-plugin-innodb_plugin"
 # Compile our client programs with static libraries to allow them to be moved
 base_configs="$base_configs --with-mysqld-ldflags=-static --with-client-ldflags=-static"
 

CMakeLists.txt

@@ -282,13 +282,13 @@ IF(NOT WITHOUT_PARTITION_STORAGE_ENGINE)
   SET (maria_plugin_defs  "${maria_plugin_defs},builtin_maria_partition_plugin")
 ENDIF(NOT WITHOUT_PARTITION_STORAGE_ENGINE)
 
-# Special handling for tmp tables with the maria engine
+# Special handling for tmp tables with the Aria engine
-IF(WITH_MARIA_STORAGE_ENGINE)
+IF(WITH_ARIA_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-DWITH_MARIA_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-DWITH_ARIA_STORAGE_ENGINE)
   IF(WITH_MARIA_TMP_TABLES)
     ADD_DEFINITIONS(-DUSE_MARIA_FOR_TMP_TABLES)
   ENDIF(WITH_MARIA_TMP_TABLES)
-ENDIF(WITH_MARIA_STORAGE_ENGINE)
+ENDIF(WITH_ARIA_STORAGE_ENGINE)
 
 ADD_DEFINITIONS(${STORAGE_ENGINE_DEFS}) 
 
@@ -395,7 +395,7 @@ INSTALL(FILES libmysql/libmysql.def DESTINATION include COMPONENT headers)
 # Handle the database files
 FILE(GLOB datafiles "${CMAKE_CURRENT_SOURCE_DIR}/win/data/mysql/*")
 INSTALL(FILES ${datafiles} DESTINATION data/clean/mysql)
-INSTALL(FILES win/data/maria_log.00000001 win/data/maria_log_control DESTINATION data/clean)
+INSTALL(FILES win/data/aria_log.00000001 win/data/aria_log_control DESTINATION data/clean)
 INSTALL(DIRECTORY win/data/test DESTINATION data/clean)
 SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
   IfFileExists '$INSTDIR\\\\data\\\\mysql\\\\db.frm' 0 CopyDatabaseFiles

mysql-test/include/have_maria.inc

@@ -1,4 +1,5 @@
-disable_query_log;
+if (!`SELECT count(*) FROM information_schema.engines WHERE
---require r/true.require
+      (support = 'YES' OR support = 'DEFAULT') AND
-select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'maria';
+      engine = 'aria'`){
-enable_query_log;
+  skip Need Aria engine;
+}

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

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;
+remove_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.aria_log_control;
-copy_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.maria_log_control;
+copy_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.aria_log_control;
 
 connection default;

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;
+  remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control;
-  copy_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.maria_log_control $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control;
+  copy_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.aria_log_control $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control;
 }
 
 --echo * recovery happens

mysql-test/lib/v1/mysql-test-run.pl

@@ -2228,20 +2228,20 @@ sub environment_setup () {
                         "$glob_basedir/myisam/myisampack"));
 
   # ----------------------------------------------------
-  # Setup env so childs can execute maria_pack and maria_chk
+  # Setup env so childs can execute aria_pack and aria_chk
   # ----------------------------------------------------
-  $ENV{'MARIA_CHK'}= mtr_native_path(mtr_exe_maybe_exists(
+  $ENV{'ARIA_CHK'}= mtr_native_path(mtr_exe_maybe_exists(
-                       vs_config_dirs('storage/maria', 'maria_chk'),
+                       vs_config_dirs('storage/maria', 'aria_chk'),
-                       vs_config_dirs('maria', 'maria_chk'),
+                       vs_config_dirs('maria', 'aria_chk'),
-                       "$path_client_bindir/maria_chk",
+                       "$path_client_bindir/aria_chk",
-                       "$glob_basedir/storage/maria/maria_chk",
+                       "$glob_basedir/storage/maria/aria_chk",
-                       "$glob_basedir/maria/maria_chk"));
+                       "$glob_basedir/maria/aria_chk"));
-  $ENV{'MARIA_PACK'}= mtr_native_path(mtr_exe_maybe_exists(
+  $ENV{'ARIA_PACK'}= mtr_native_path(mtr_exe_maybe_exists(
-                        vs_config_dirs('storage/maria', 'maria_pack'),
+                        vs_config_dirs('storage/maria', 'aria_pack'),
-                        vs_config_dirs('maria', 'maria_pack'),
+                        vs_config_dirs('maria', 'aria_pack'),
-                        "$path_client_bindir/maria_pack",
+                        "$path_client_bindir/aria_pack",
-                        "$glob_basedir/storage/maria/maria_pack",
+                        "$glob_basedir/storage/maria/aria_pack",
-                        "$glob_basedir/maria/maria_pack"));
+                        "$glob_basedir/maria/aria_pack"));
 
   # ----------------------------------------------------
   # We are nice and report a bit about our settings
@@ -3192,7 +3192,7 @@ sub install_db ($$) {
   mtr_add_arg($args, "--datadir=%s", $data_dir);
   mtr_add_arg($args, "--loose-skip-innodb");
   mtr_add_arg($args, "--loose-skip-ndbcluster");
-  mtr_add_arg($args, "--loose-skip-maria");
+  mtr_add_arg($args, "--loose-skip-aria");
   mtr_add_arg($args, "--disable-sync-frm");
   mtr_add_arg($args, "--loose-disable-debug");
   mtr_add_arg($args, "--tmpdir=.");
@@ -3202,7 +3202,7 @@ sub install_db ($$) {
   # Setup args for bootstrap.test
   #
   mtr_init_args(\$cmd_args);
-  mtr_add_arg($cmd_args, "--loose-skip-maria");
+  mtr_add_arg($cmd_args, "--loose-skip-aria");
 
   if ( $opt_debug )
   {

mysql-test/mysql-test-run.pl

@@ -1925,7 +1925,7 @@ sub mysqld_client_arguments () {
 
 
 sub have_maria_support () {
-  my $maria_var= $mysqld_variables{'maria'};
+  my $maria_var= $mysqld_variables{'aria'};
   return defined $maria_var and $maria_var eq 'TRUE';
 }
 
@@ -2124,12 +2124,12 @@ sub environment_setup {
   $ENV{'MYISAM_FTDUMP'}= tool_arguments("storage/myisam", "myisam_ftdump");
 
   # ----------------------------------------------------
-  # maria tools
+  # aria tools
   # ----------------------------------------------------
   if (have_maria_support())
   {
-    $ENV{'MARIA_CHK'}= tool_arguments("storage/maria", "maria_chk");
+    $ENV{'MARIA_CHK'}= tool_arguments("storage/maria", "aria_chk");
-    $ENV{'MARIA_PACK'}= tool_arguments("storage/maria", "maria_pack");
+    $ENV{'MARIA_PACK'}= tool_arguments("storage/maria", "aria_pack");
   }
 
   # ----------------------------------------------------
@@ -3018,7 +3018,7 @@ sub mysql_install_db {
   mtr_add_arg($args, "--loose-skip-innodb");
   mtr_add_arg($args, "--loose-skip-pbxt");
   mtr_add_arg($args, "--loose-skip-ndbcluster");
-  mtr_add_arg($args, "--loose-skip-maria");
+  mtr_add_arg($args, "--loose-skip-aria");
   mtr_add_arg($args, "--disable-sync-frm");
   mtr_add_arg($args, "--loose-disable-debug");
   mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/");
@@ -3045,7 +3045,7 @@ sub mysql_install_db {
   # Setup args for bootstrap.test
   #
   #mtr_init_args(\$cmd_args);
-  #mtr_add_arg($cmd_args, "--loose-skip-maria")
+  #mtr_add_arg($cmd_args, "--loose-skip-aria")
 
   # ----------------------------------------------------------------------
   # export MYSQLD_BOOTSTRAP_CMD variable containing <path>/mysqld <args>

mysql-test/suite/funcs_1/datadict/is_routines.inc

@@ -75,7 +75,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval DESCRIBE          information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
+--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval SHOW COLUMNS FROM information_schema.$is_table;

mysql-test/suite/funcs_1/datadict/is_triggers.inc

@@ -70,7 +70,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval DESCRIBE          information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
+--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval SHOW COLUMNS FROM information_schema.$is_table;

mysql-test/suite/funcs_1/datadict/is_views.inc

@@ -57,7 +57,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval DESCRIBE          information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
+--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval SHOW COLUMNS FROM information_schema.$is_table;

mysql-test/suite/funcs_1/datadict/processlist_priv.inc

@@ -155,7 +155,7 @@ let $wait_condition=
 SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE DB = 'information_schema' AND COMMAND = 'Sleep' AND USER = 'ddicttestuser1';
 --source include/wait_condition.inc
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
+--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE $table;
 --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS
 eval SHOW $table;
@@ -175,7 +175,7 @@ connection con100;
 # No need for poll routine here.
 # The current state of the default session might depend on load of testing box
 # but "ddicttestuser1" must not see anything of the root session.
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
+--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE $table;
 --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS
 eval SHOW $table;

mysql-test/suite/funcs_1/datadict/processlist_val.inc

@@ -72,7 +72,7 @@ echo
 # Show the definition of the PROCESSLIST table
 #--------------------------------------------------------------------------
 ;
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
+--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST;
 
 echo

mysql-test/suite/funcs_1/datadict/tables2.inc

@@ -31,7 +31,7 @@ let $ndb_pattern    = 'number_of_replicas';
 --vertical_results
 # We do not unify the engine name here, because the rowformat is
 # specific to the engine.
---replace_result Dynamic DYNAMIC_OR_PAGE Page DYNAMIC_OR_PAGE MyISAM MYISAM_OR_MARIA MARIA MYISAM_OR_MARIA
+--replace_result Dynamic DYNAMIC_OR_PAGE Page DYNAMIC_OR_PAGE MyISAM MYISAM_OR_MARIA Aria MYISAM_OR_MARIA
 --replace_column  8 "#TBLR#" 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "#CRT#" 16 "#UT#" 17 "#CT#" 20 "#CO#" 21 "#TC#"
 eval
 SELECT *,

mysql-test/suite/funcs_1/t/is_columns.test

@@ -78,7 +78,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval DESCRIBE          information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
+--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval SHOW COLUMNS FROM information_schema.$is_table;

mysql-test/suite/funcs_1/t/is_events.test

@@ -89,7 +89,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 #                     is associated.
 #
 eval DESCRIBE          information_schema.$is_table;
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
+--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE information_schema.$is_table;
 eval SHOW COLUMNS FROM information_schema.$is_table;
 

mysql-test/suite/maria/r/group_commit.result

@@ -1,17 +1,17 @@
 drop table if exists t1;
 create table t1 (a int);
-SET GLOBAL maria_group_commit="NONE";
+SET GLOBAL aria_group_commit="NONE";
-SET GLOBAL maria_group_commit_interval= 0;
+SET GLOBAL aria_group_commit_interval= 0;
-SET GLOBAL maria_group_commit="NONE";
+SET GLOBAL aria_group_commit="NONE";
-SET GLOBAL maria_group_commit_interval= 100;
+SET GLOBAL aria_group_commit_interval= 100;
-SET GLOBAL maria_group_commit="HARD";
+SET GLOBAL aria_group_commit="HARD";
-SET GLOBAL maria_group_commit_interval= 0;
+SET GLOBAL aria_group_commit_interval= 0;
-SET GLOBAL maria_group_commit="HARD";
+SET GLOBAL aria_group_commit="HARD";
-SET GLOBAL maria_group_commit_interval= 100;
+SET GLOBAL aria_group_commit_interval= 100;
-SET GLOBAL maria_group_commit="SOFT";
+SET GLOBAL aria_group_commit="SOFT";
-SET GLOBAL maria_group_commit_interval= 0;
+SET GLOBAL aria_group_commit_interval= 0;
-SET GLOBAL maria_group_commit="SOFT";
+SET GLOBAL aria_group_commit="SOFT";
-SET GLOBAL maria_group_commit_interval= 100;
+SET GLOBAL aria_group_commit_interval= 100;
-SET GLOBAL maria_group_commit="NONE";
+SET GLOBAL aria_group_commit="NONE";
-SET GLOBAL maria_group_commit_interval= 0;
+SET GLOBAL aria_group_commit_interval= 0;
 drop table t1;

mysql-test/suite/maria/r/maria-autozerofill.result

@@ -1,7 +1,7 @@
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
-create table t1(a int) engine=maria;
+create table t1(a int) engine=aria;
 insert into t1 values(1);
 flush table t1;
 create_rename_lsn has non-magic value

mysql-test/suite/maria/r/maria-big.result

@@ -1,5 +1,5 @@
 set global max_allowed_packet=400000000;
-set storage_engine=maria;
+set storage_engine=aria;
 affected rows: 0
 drop table if exists t1, t2;
 affected rows: 0

mysql-test/suite/maria/r/maria-big2.result

@@ -1,4 +1,4 @@
-create table t2(id int,a varchar(255),b varchar(255),key(a))engine=maria row_format=dynamic transactional=0;
+create table t2(id int,a varchar(255),b varchar(255),key(a))engine=aria row_format=dynamic transactional=0;
 Table	Op	Msg_type	Msg_text
 test.t2	check	status	OK
 Table	Op	Msg_type	Msg_text

mysql-test/suite/maria/r/maria-connect.result

@@ -1,5 +1,5 @@
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
 drop table if exists t1;
 SET SQL_WARNINGS=1;
 RESET MASTER;

mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result

@@ -1,4 +1,4 @@
-set storage_engine=maria;
+set storage_engine=aria;
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (
 fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
@@ -12,7 +12,7 @@ t1	CREATE TABLE `t1` (
   `g` geometry NOT NULL,
   PRIMARY KEY (`fid`),
   SPATIAL KEY `g` (`g`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=DYNAMIC
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=DYNAMIC
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(150 150, 150 150)'));
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(149 149, 151 151)'));
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(148 148, 152 152)'));
@@ -295,7 +295,7 @@ t2	CREATE TABLE `t2` (
   `g` geometry NOT NULL,
   PRIMARY KEY (`fid`),
   SPATIAL KEY `g` (`g`)
-) ENGINE=MARIA AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=DYNAMIC
+) ENGINE=Aria AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=DYNAMIC
 SELECT count(*) FROM t2;
 count(*)
 100

mysql-test/suite/maria/r/maria-gis-rtree-trans.result

@@ -1,4 +1,4 @@
-set storage_engine=maria;
+set storage_engine=aria;
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (
 fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
@@ -12,7 +12,7 @@ t1	CREATE TABLE `t1` (
   `g` geometry NOT NULL,
   PRIMARY KEY (`fid`),
   SPATIAL KEY `g` (`g`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=1
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(150 150, 150 150)'));
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(149 149, 151 151)'));
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(148 148, 152 152)'));
@@ -295,7 +295,7 @@ t2	CREATE TABLE `t2` (
   `g` geometry NOT NULL,
   PRIMARY KEY (`fid`),
   SPATIAL KEY `g` (`g`)
-) ENGINE=MARIA AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=1
+) ENGINE=Aria AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=1
 SELECT count(*) FROM t2;
 count(*)
 100

mysql-test/suite/maria/r/maria-gis-rtree.result

@@ -1,4 +1,4 @@
-set storage_engine=maria;
+set storage_engine=aria;
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (
 fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
@@ -12,7 +12,7 @@ t1	CREATE TABLE `t1` (
   `g` geometry NOT NULL,
   PRIMARY KEY (`fid`),
   SPATIAL KEY `g` (`g`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(150 150, 150 150)'));
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(149 149, 151 151)'));
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(148 148, 152 152)'));
@@ -295,7 +295,7 @@ t2	CREATE TABLE `t2` (
   `g` geometry NOT NULL,
   PRIMARY KEY (`fid`),
   SPATIAL KEY `g` (`g`)
-) ENGINE=MARIA AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0
+) ENGINE=Aria AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0
 SELECT count(*) FROM t2;
 count(*)
 100

mysql-test/suite/maria/r/maria-mvcc.result

@@ -1,11 +1,11 @@
-set global maria_page_checksum=1;
+set global aria_page_checksum=1;
 drop table if exists t1;
-create table t1 (i int) engine=maria;
+create table t1 (i int) engine=aria;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 insert into t1 values (0);
 lock tables t1 write concurrent;
 insert into t1 values (1);
@@ -151,7 +151,7 @@ select count(*) from t1;
 count(*)
 8
 drop table t1;
-CREATE TABLE t1 (fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,    g GEOMETRY NOT NULL,   SPATIAL KEY(g) ) transactional=1 row_format=page engine=maria;
+CREATE TABLE t1 (fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,    g GEOMETRY NOT NULL,   SPATIAL KEY(g) ) transactional=1 row_format=page engine=aria;
 lock tables t1 write concurrent, t1 as t2 write concurrent;
 insert into t1 (fid,g) values (NULL,GeomFromText('LineString(0 0,1 1)'));
 select fid from t1 as t2;

mysql-test/suite/maria/r/maria-no-logging.result

@@ -1,8 +1,8 @@
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
-set global maria_checkpoint_interval=0;
+set global aria_checkpoint_interval=0;
 create table t2 (a varchar(100)) engine=myisam;
 insert into t2 select repeat('z',100);
 insert into t2 select * from t2;
@@ -12,40 +12,40 @@ insert into t2 select * from t2;
 insert into t2 select * from t2;
 insert into t2 select * from t2;
 * shut down mysqld, removed logs, restarted it
-create table t1 (a varchar(100)) engine=maria transactional=1;
+create table t1 (a varchar(100)) engine=aria transactional=1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(100) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1
-show engine maria logs;
+show engine aria logs;
 Type	Name	Status
-MARIA	Size        16384 maria_log.00000001	unknown
+Aria	Size        16384 aria_log.00000001	unknown
 insert into t1 values('a');
 insert into t1 select * from t2;
-show engine maria logs;
+show engine aria logs;
 Type	Name	Status
-MARIA	Size        24576 maria_log.00000001	unknown
+Aria	Size        24576 aria_log.00000001	unknown
 * shut down mysqld, removed logs, restarted it
 truncate table t1;
 insert into t1 select * from t2;
-show engine maria logs;
+show engine aria logs;
 Type	Name	Status
-MARIA	Size        16384 maria_log.00000001	unknown
+Aria	Size        16384 aria_log.00000001	unknown
 drop table t1;
 * shut down mysqld, removed logs, restarted it
-create table t1 (a varchar(100)) engine=maria transactional=1;
+create table t1 (a varchar(100)) engine=aria transactional=1;
 insert into t1 values('a');
 create table if not exists t1 select * from t2;
 Warnings:
 Note	1050	Table 't1' already exists
-show engine maria logs;
+show engine aria logs;
 Type	Name	Status
-MARIA	Size        24576 maria_log.00000001	unknown
+Aria	Size        24576 aria_log.00000001	unknown
 * shut down mysqld, removed logs, restarted it
 drop table t1;
-create table t1 engine=maria transactional=1 select * from t2;
+create table t1 engine=aria transactional=1 select * from t2;
-show engine maria logs;
+show engine aria logs;
 Type	Name	Status
-MARIA	Size        16384 maria_log.00000001	unknown
+Aria	Size        16384 aria_log.00000001	unknown
 drop database mysqltest;

mysql-test/suite/maria/r/maria-partitioning.result

@@ -1,11 +1,11 @@
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
 DROP TABLE if exists t1,t2;
 Warnings:
 Note	1051	Unknown table 't1'
 Note	1051	Unknown table 't2'
-create table t2(a blob) engine=maria;
+create table t2(a blob) engine=aria;
-create table t1(a int primary key) engine=maria;
+create table t1(a int primary key) engine=aria;
 insert into t2 values ('foo'),('bar');
 select * from t2 left join t1 on (t2.a=t1.a) where t2.a='bbb';
 a	a
@@ -16,8 +16,8 @@ insert into t1 values (2);
 select * from t2 left join t1 on (t2.a=t1.a) where t2.a='bbb';
 a	a
 drop table t1,t2;
-create table t2(a blob) engine= maria;
+create table t2(a blob) engine= aria;
-create table t1(a int primary key) engine= maria PARTITION BY HASH (a) PARTITIONS 2;
+create table t1(a int primary key) engine= aria 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';
 a	a

mysql-test/suite/maria/r/maria-preload.result

@@ -1,20 +1,20 @@
 drop table if exists t1, t2;
-set global maria_checkpoint_interval=0;
+set global aria_checkpoint_interval=0;
 create temporary table initial
 select variable_name,variable_value from
-information_schema.global_status where variable_name like "Maria_pagecache_reads";
+information_schema.global_status where variable_name like "Aria_pagecache_reads";
 create table t1 (
 a int not null auto_increment,
 b char(16) not null,
 primary key (a),
 key (b)
-) engine=maria row_format=dynamic;
+) engine=aria row_format=dynamic;
 create table t2(
 a int not null auto_increment,
 b char(16) not null,
 primary key (a),
 key (b)
-) engine=maria row_format=dynamic;
+) engine=aria row_format=dynamic;
 insert into t1(b) values 
 ('test0'),
 ('test1'),
@@ -50,21 +50,21 @@ count(*)
 20672
 flush tables;
 flush status;
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	2
+ARIA_PAGECACHE_READS	2
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	9
+ARIA_PAGECACHE_READS	9
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	9
+ARIA_PAGECACHE_READS	9
 flush tables;
 flush status;
 select @@preload_buffer_size;
@@ -73,20 +73,20 @@ select @@preload_buffer_size;
 load index into cache t1;
 Table	Op	Msg_type	Msg_text
 test.t1	preload_keys	status	OK
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	80
+ARIA_PAGECACHE_READS	80
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	80
+ARIA_PAGECACHE_READS	80
 flush tables;
 flush status;
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	80
+ARIA_PAGECACHE_READS	80
 set session preload_buffer_size=256*1024;
 select @@preload_buffer_size;
 @@preload_buffer_size
@@ -94,20 +94,20 @@ select @@preload_buffer_size;
 load index into cache t1 ignore leaves;
 Table	Op	Msg_type	Msg_text
 test.t1	preload_keys	status	OK
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	151
+ARIA_PAGECACHE_READS	151
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	157
+ARIA_PAGECACHE_READS	157
 flush tables;
 flush status;
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	157
+ARIA_PAGECACHE_READS	157
 set session preload_buffer_size=1*1024;
 select @@preload_buffer_size;
 @@preload_buffer_size
@@ -116,45 +116,45 @@ load index into cache t1, t2 key (primary,b) ignore leaves;
 Table	Op	Msg_type	Msg_text
 test.t1	preload_keys	status	OK
 test.t2	preload_keys	status	OK
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	271
+ARIA_PAGECACHE_READS	271
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
 select count(*) from t2 where b = 'test1';
 count(*)
 2584
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	274
+ARIA_PAGECACHE_READS	274
 flush tables;
 flush status;
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	274
+ARIA_PAGECACHE_READS	274
 load index into cache t3, t2 key (primary,b) ;
 Table	Op	Msg_type	Msg_text
 test.t3	preload_keys	Error	Table 'test.t3' doesn't exist
 test.t3	preload_keys	status	Operation failed
 test.t2	preload_keys	status	OK
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	317
+ARIA_PAGECACHE_READS	317
 flush tables;
 flush status;
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	317
+ARIA_PAGECACHE_READS	317
 load index into cache t3 key (b), t2 key (c) ;
 Table	Op	Msg_type	Msg_text
 test.t3	preload_keys	Error	Table 'test.t3' doesn't exist
 test.t3	preload_keys	status	Operation failed
 test.t2	preload_keys	Error	Key 'c' doesn't exist in table 't2'
 test.t2	preload_keys	status	Operation failed
-select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 variable_name	g.variable_value-i.variable_value
-MARIA_PAGECACHE_READS	317
+ARIA_PAGECACHE_READS	317
 drop table t1, t2;
 drop temporary table initial;
 show status like "key_read%";

mysql-test/suite/maria/r/maria-purge.result

@@ -1,7 +1,7 @@
 * shut down mysqld, removed logs, restarted it
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 drop table if exists t1,t2;
 SET SQL_WARNINGS=1;
 CREATE TABLE t1 (
@@ -34,60 +34,60 @@ insert into t2 select * from t1;
 insert into t1 select * from t2;
 insert into t2 select * from t1;
 insert into t1 select * from t2;
-set global maria_log_file_size=16777216;
+set global aria_log_file_size=16777216;
-set global maria_checkpoint_interval=30;
+set global aria_checkpoint_interval=30;
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 Type	Name	Status
-MARIA	maria_log.00000002	in use
+Aria	aria_log.00000002	in use
 insert into t2 select * from t1;
 insert into t1 select * from t2;
-set global maria_checkpoint_interval=30;
+set global aria_checkpoint_interval=30;
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 Type	Name	Status
-MARIA	maria_log.00000004	in use
+Aria	aria_log.00000004	in use
-set global maria_log_file_size=16777216;
+set global aria_log_file_size=16777216;
-select @@global.maria_log_file_size;
+select @@global.aria_log_file_size;
-@@global.maria_log_file_size
+@@global.aria_log_file_size
 16777216
-set global maria_checkpoint_interval=30;
+set global aria_checkpoint_interval=30;
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 Type	Name	Status
-MARIA	maria_log.00000004	in use
+Aria	aria_log.00000004	in use
-set global maria_log_file_size=8388608;
+set global aria_log_file_size=8388608;
-select @@global.maria_log_file_size;
+select @@global.aria_log_file_size;
-@@global.maria_log_file_size
+@@global.aria_log_file_size
 8388608
-set global maria_log_purge_type=at_flush;
+set global aria_log_purge_type=at_flush;
 insert into t1 select * from t2;
-set global maria_checkpoint_interval=30;
+set global aria_checkpoint_interval=30;
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 Type	Name	Status
-MARIA	maria_log.00000004	free
+Aria	aria_log.00000004	free
-MARIA	maria_log.00000005	free
+Aria	aria_log.00000005	free
-MARIA	maria_log.00000006	free
+Aria	aria_log.00000006	free
-MARIA	maria_log.00000007	free
+Aria	aria_log.00000007	free
-MARIA	maria_log.00000008	in use
+Aria	aria_log.00000008	in use
 flush logs;
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 Type	Name	Status
-MARIA	maria_log.00000008	in use
+Aria	aria_log.00000008	in use
-set global maria_log_file_size=16777216;
+set global aria_log_file_size=16777216;
-set global maria_log_purge_type=external;
+set global aria_log_purge_type=external;
 insert into t1 select * from t2;
-set global maria_checkpoint_interval=30;
+set global aria_checkpoint_interval=30;
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 Type	Name	Status
-MARIA	maria_log.00000008	free
+Aria	aria_log.00000008	free
-MARIA	maria_log.00000009	in use
+Aria	aria_log.00000009	in use
 flush logs;
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 Type	Name	Status
-MARIA	maria_log.00000008	free
+Aria	aria_log.00000008	free
-MARIA	maria_log.00000009	in use
+Aria	aria_log.00000009	in use
-set global maria_log_purge_type=immediate;
+set global aria_log_purge_type=immediate;
 insert into t1 select * from t2;
-set global maria_checkpoint_interval=30;
+set global aria_checkpoint_interval=30;
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 Type	Name	Status
-MARIA	maria_log.00000011	in use
+Aria	aria_log.00000011	in use
 drop table t1, t2;

mysql-test/suite/maria/r/maria-recover.result

@@ -1,22 +1,22 @@
-select @@global.maria_recover;
+select @@global.aria_recover;
-@@global.maria_recover
+@@global.aria_recover
 BACKUP
-set global maria_recover=off;
+set global aria_recover=off;
-select @@global.maria_recover;
+select @@global.aria_recover;
-@@global.maria_recover
+@@global.aria_recover
 OFF
-set global maria_recover=default;
+set global aria_recover=default;
-select @@global.maria_recover;
+select @@global.aria_recover;
-@@global.maria_recover
+@@global.aria_recover
 NORMAL
-set global maria_recover=normal;
+set global aria_recover=normal;
-select @@global.maria_recover;
+select @@global.aria_recover;
-@@global.maria_recover
+@@global.aria_recover
 NORMAL
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
-create table t1 (a varchar(1000), index(a)) engine=maria;
+create table t1 (a varchar(1000), index(a)) engine=aria;
 insert into t1 values("ThursdayMorningsMarket");
 flush table t1;
 insert into t1 select concat(a,'b') from t1 limit 1;
@@ -32,4 +32,4 @@ select * from t_corrupted2;
 a
 ThursdayMorningsMarket
 drop database mysqltest;
-set global maria_recover=backup;
+set global aria_recover=backup;

mysql-test/suite/maria/r/maria-recovery-big.result

@@ -1,10 +1,10 @@
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
 * TEST of recovery with blobs
 * shut down mysqld, removed logs, restarted it
-create table t1 (a int, b longtext) engine=maria table_checksum=1;
+create table t1 (a int, b longtext) engine=aria table_checksum=1;
 * copied t1 for feeding_recovery
 insert into t1 values (1,"123456789012345678901234567890"),(2,"09876543210987654321");
 flush table t1;
@@ -62,7 +62,7 @@ a	length(b)
 2	5
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * copied t1 back for feeding_recovery
 * recovery happens

mysql-test/suite/maria/r/maria-recovery-bitmap.result

@@ -2,7 +2,7 @@ drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
 * shut down mysqld, removed logs, restarted it
-create table t1 (a varchar(10000)) engine=maria;
+create table t1 (a varchar(10000)) engine=aria;
 * TEST of over-allocated bitmap not flushed by checkpoint
 insert into t1 values ("bbbbbbb");
 flush table t1;
@@ -11,10 +11,10 @@ insert into t1 values ("bbbbbbb");
 delete from t1 limit 1;
 set session debug="+d,info,enter,exit,maria_over_alloc_bitmap";
 insert into t1 values ("aaaaaaaaa");
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 SET SESSION debug="+d,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;
@@ -31,7 +31,7 @@ lock tables t1 write;
 insert into t1 values (REPEAT('a', 6000));
 SET SESSION debug="+d,maria_flush_bitmap,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;

mysql-test/suite/maria/r/maria-recovery-rtree-ft.result

@@ -1,4 +1,4 @@
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
@@ -8,12 +8,12 @@ line LINESTRING NOT NULL,
 kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po',
 name VARCHAR(32)
 ,SPATIAL key (line)
-) transactional=1 row_format=page engine=maria;
+) transactional=1 row_format=page engine=aria;
 SHOW INDEX FROM t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	1	line	1	line	A	NULL	32	NULL		SPATIAL	
 CREATE TABLE t2 (a VARCHAR(200), b TEXT, FULLTEXT (a,b)
-) transactional=1 row_format=page engine=maria;
+) transactional=1 row_format=page engine=aria;
 SHOW INDEX FROM t2;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t2	1	a	1	a	NULL	NULL	NULL	NULL	YES	FULLTEXT	
@@ -27,7 +27,7 @@ flush table t1;
 * copied t1 for comparison
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * copied t2 back for feeding_recovery
 * copied t1 back for feeding_recovery
@@ -53,7 +53,7 @@ flush table t1;
 lock tables t1 write, t2 write;
 SET SESSION debug="+d,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t2 extended;
@@ -76,7 +76,7 @@ flush table t1;
 lock tables t1 write, t2 write;
 SET SESSION debug="+d,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t2 extended;
@@ -99,7 +99,7 @@ flush table t1;
 lock tables t1 write, t2 write;
 SET SESSION debug="+d,maria_flush_states,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t2 extended;
@@ -122,7 +122,7 @@ flush table t1;
 lock tables t1 write, t2 write;
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t2 extended;
@@ -140,7 +140,7 @@ ok
 use mysqltest;
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t2 extended;

mysql-test/suite/maria/r/maria-recovery.result

@@ -1,9 +1,9 @@
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
 * shut down mysqld, removed logs, restarted it
-create table t1 (a varchar(1000)) engine=maria;
+create table t1 (a varchar(1000)) engine=aria;
 * TEST of REDO: see if recovery can reconstruct if we give it an old table
 * copied t1 for feeding_recovery
 insert into t1 values ("00000000");
@@ -11,7 +11,7 @@ flush table t1;
 * copied t1 for comparison
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * copied t1 back for feeding_recovery
 * recovery happens
@@ -34,7 +34,7 @@ lock tables t1 write;
 insert into t1 values ("aaaaaaaaa");
 SET SESSION debug="+d,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;
@@ -55,7 +55,7 @@ lock tables t1 write;
 insert into t1 values ("aaaaaaaaa");
 SET SESSION debug="+d,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;
@@ -77,7 +77,7 @@ lock tables t1 write;
 insert into t1 values ("aaaaaaaaa");
 SET SESSION debug="+d,maria_flush_states,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;
@@ -100,7 +100,7 @@ lock tables t1 write;
 insert into t1 values ("aaaaaaaaa");
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;
@@ -124,7 +124,7 @@ CREATE TABLE t1 (
 i int,
 b blob default NULL,
 c varchar(6000) default NULL
-) ENGINE=MARIA CHECKSUM=1;
+) ENGINE=ARIA CHECKSUM=1;
 * copied t1 for feeding_recovery
 INSERT INTO t1 VALUES (1, REPEAT('a', 5000), REPEAT('b', 5000));
 UPDATE t1 SET i=3, b=CONCAT(b,'c') WHERE i=1;
@@ -135,7 +135,7 @@ flush table t1;
 * copied t1 for comparison
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * copied t1 back for feeding_recovery
 * recovery happens
@@ -156,7 +156,7 @@ CREATE TABLE t1 (
 i int auto_increment primary key,
 c varchar(6),
 key(c)
-) ENGINE=MARIA;
+) ENGINE=ARIA;
 insert into t1 values(null,"b");
 * copied t1 for feeding_recovery
 insert into t1 values(null,"a"), (null,"c"), (null,"d");
@@ -165,7 +165,7 @@ flush table t1;
 * copied t1 for comparison
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * copied t1 back for feeding_recovery
 * recovery happens
@@ -183,7 +183,7 @@ t1	CREATE TABLE `t1` (
   `c` varchar(6) DEFAULT NULL,
   PRIMARY KEY (`i`),
   KEY `c` (`c`)
-) ENGINE=MARIA AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 * TEST of UPDATE vs state.auto_increment
 * copied t1 for feeding_recovery
 update t1 set i=15 where c="a";
@@ -191,7 +191,7 @@ flush table t1;
 * copied t1 for comparison
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * copied t1 back for feeding_recovery
 * recovery happens
@@ -209,7 +209,7 @@ t1	CREATE TABLE `t1` (
   `c` varchar(6) DEFAULT NULL,
   PRIMARY KEY (`i`),
   KEY `c` (`c`)
-) ENGINE=MARIA AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 * TEST of INSERT's rollback vs state.auto_increment
 flush table t1;
 * copied t1 for comparison
@@ -217,7 +217,7 @@ lock tables t1 write;
 insert into t1 values(null, "e");
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;
@@ -234,7 +234,7 @@ t1	CREATE TABLE `t1` (
   `c` varchar(6) DEFAULT NULL,
   PRIMARY KEY (`i`),
   KEY `c` (`c`)
-) ENGINE=MARIA AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 insert into t1 values(null, "f");
 drop table t1;
 drop database mysqltest_for_feeding_recovery;

mysql-test/suite/maria/r/maria-recovery2.result

@@ -1,13 +1,13 @@
-call mtr.add_suppression("File '.*maria_log.000.*' not found \\(Errcode: 2\\)");
+call mtr.add_suppression("File '.*aria_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");
+call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with aria_chk -r");
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
 * TEST of removing logs manually
 * shut down mysqld, removed logs, restarted it
 * TEST of UNDO_ROW_DELETE preserving rowid
-create table t1(a int) engine=maria;
+create table t1(a int) engine=aria;
 insert into t1 values(1),(2);
 flush table t1;
 * copied t1 for comparison
@@ -16,7 +16,7 @@ insert into t1 values(3);
 delete from t1 where a in (1,2,3);
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;
@@ -29,8 +29,8 @@ use mysqltest;
 drop table t1;
 * TEST of checkpoint
 set global debug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect";
-set global maria_checkpoint_interval=10000;
+set global aria_checkpoint_interval=10000;
-create table t1(a int, b varchar(10), index(a,b)) engine=maria;
+create table t1(a int, b varchar(10), index(a,b)) engine=aria;
 insert into t1 values(1,"a"),(2,"b"),(3,"c");
 delete from t1 where b="b";
 update t1 set b="d" where a=1;
@@ -40,14 +40,14 @@ lock tables t1 write;
 insert into t1 values(4,"e"),(5,"f"),(6,"g");
 update t1 set b="h" where a=5;
 delete from t1 where b="g";
-show status like "Maria_pagecache_blocks_not_flushed";
+show status like "Aria_pagecache_blocks_not_flushed";
 Variable_name	Value
-Maria_pagecache_blocks_not_flushed	3
+Aria_pagecache_blocks_not_flushed	3
-set global maria_checkpoint_interval=10000;
+set global aria_checkpoint_interval=10000;
 update t1 set b="i" where a=5;
 SET SESSION debug="+d,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;
@@ -59,7 +59,7 @@ ok
 use mysqltest;
 drop table t1;
 Test of REPAIR's implicit commit
-create table t1 (a varchar(100), key(a)) engine=maria;
+create table t1 (a varchar(100), key(a)) engine=aria;
 insert into t1 values(3);
 flush table t1;
 * copied t1 for comparison
@@ -76,7 +76,7 @@ a
 3
 SET SESSION debug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;
@@ -92,7 +92,7 @@ a
 3
 drop table t1;
 * TEST of recovery when crash before bulk-insert-with-repair is committed
-create table t1 (a varchar(100), key(a)) engine=maria;
+create table t1 (a varchar(100), key(a)) engine=aria;
 create table t2 (a varchar(100)) engine=myisam;
 set rand_seed1=12, rand_seed2=254;
 insert into t2 values (rand());
@@ -110,7 +110,7 @@ delete from t1 limit 1;
 insert into t1 select * from t2;
 SET SESSION debug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;
@@ -125,7 +125,7 @@ Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_par
 t1	1	a	1	a	A	1	NULL	NULL	YES	BTREE	
 drop table t1;
 * TEST of recovery when OPTIMIZE has replaced the index file and crash
-create table t_corrupted1 (a varchar(100), key(a)) engine=maria;
+create table t_corrupted1 (a varchar(100), key(a)) engine=aria;
 insert into t_corrupted1 select (rand()) from t2;
 flush table t_corrupted1;
 * copied t_corrupted1 for comparison

mysql-test/suite/maria/r/maria-recovery3.result

@@ -1,20 +1,20 @@
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
 * shut down mysqld, removed logs, restarted it
 * TEST of Checkpoint between writing the commit log record and committing in trnman
-create table t1(a int primary key) engine=maria;
+create table t1(a int primary key) engine=aria;
 insert into t1 values(1);
 flush table t1;
 * copied t1 for comparison
 set session debug="+d,maria_sleep_in_commit";
 insert into t1 values(2);
-set global maria_checkpoint_interval=1000;
+set global aria_checkpoint_interval=1000;
 delete from t1 where a=2;
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * recovery happens
 check table t1 extended;
@@ -29,11 +29,11 @@ drop table t1;
 CREATE TABLE `t1` (
 `blob` blob,
 `blob_key` blob
-) ENGINE=maria ROW_FORMAT=page
+) ENGINE=aria ROW_FORMAT=page
 ;
 * copied t1 for feeding_recovery
 * compared t1 to old version
-set global maria_checkpoint_interval=0;
+set global aria_checkpoint_interval=0;
 INSERT INTO `t1` VALUES (NULL,repeat('A',5198));
 INSERT INTO `t1` VALUES (NULL,repeat('B',65535));
 INSERT INTO `t1` VALUES (repeat('K',5198),repeat('L',2325));
@@ -50,7 +50,7 @@ flush table t1;
 * compared t1 to old version
 SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
 * copied t1 back for feeding_recovery
 * recovery happens
@@ -63,9 +63,9 @@ ok
 * compared t1 to old version
 use mysqltest;
 drop table t1;
-create table t1 engine=maria select 1;
+create table t1 engine=aria select 1;
 * copied t1 for feeding_recovery
-set global maria_checkpoint_interval=0;
+set global aria_checkpoint_interval=0;
 insert into t1 values(2);
 truncate table t1;
 flush table t1;

mysql-test/suite/maria/r/maria.result

@@ -1,10 +1,10 @@
-select * from INFORMATION_SCHEMA.ENGINES where ENGINE="MARIA";
+select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA";
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
-MARIA	YES	Crash-safe tables with MyISAM heritage	YES	NO	NO
+Aria	YES	Crash-safe tables with MyISAM heritage	YES	NO	NO
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
-set global maria_page_checksum=0;
+set global aria_page_checksum=0;
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 drop table if exists t1,t2;
 drop view if exists v1;
 SET SQL_WARNINGS=1;
@@ -702,9 +702,9 @@ checksum table t1;
 Table	Checksum
 test.t1	4183529555
 drop table t1;
-show variables like 'maria_stats_method';
+show variables like 'aria_stats_method';
 Variable_name	Value
-maria_stats_method	nulls_unequal
+aria_stats_method	nulls_unequal
 create table t1 (a int, key(a));
 insert into t1 values (0),(1),(2),(3),(4);
 insert into t1 select NULL from t1;
@@ -722,10 +722,10 @@ test.t1	check	status	OK
 show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	1	a	1	a	A	10	NULL	NULL	YES	BTREE	
-set maria_stats_method=nulls_equal;
+set aria_stats_method=nulls_equal;
-show variables like 'maria_stats_method';
+show variables like 'aria_stats_method';
 Variable_name	Value
-maria_stats_method	nulls_equal
+aria_stats_method	nulls_equal
 insert into t1 values (11);
 delete from t1 where a=11;
 analyze table t1;
@@ -742,10 +742,10 @@ test.t1	check	status	OK
 show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE	
-set maria_stats_method=DEFAULT;
+set aria_stats_method=DEFAULT;
-show variables like 'maria_stats_method';
+show variables like 'aria_stats_method';
 Variable_name	Value
-maria_stats_method	nulls_unequal
+aria_stats_method	nulls_unequal
 insert into t1 values (11);
 delete from t1 where a=11;
 analyze table t1;
@@ -763,10 +763,10 @@ show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	1	a	1	a	A	10	NULL	NULL	YES	BTREE	
 drop table t1;
-set maria_stats_method=nulls_ignored;
+set aria_stats_method=nulls_ignored;
-show variables like 'maria_stats_method';
+show variables like 'aria_stats_method';
 Variable_name	Value
-maria_stats_method	nulls_ignored
+aria_stats_method	nulls_ignored
 create table t1 (
 a char(3), b char(4), c char(5), d char(6),
 key(a,b,c,d)
@@ -794,7 +794,7 @@ t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE
 t1	1	a	2	b	A	0	NULL	NULL	YES	BTREE	
 t1	1	a	3	c	A	0	NULL	NULL	YES	BTREE	
 t1	1	a	4	d	A	0	NULL	NULL	YES	BTREE	
-set maria_stats_method=DEFAULT;
+set aria_stats_method=DEFAULT;
 drop table t1;
 create table t1(
 cip INT NOT NULL,
@@ -819,7 +819,7 @@ id2 int not null default '0',
 t text not null,
 primary key  (id1),
 key x (id2, t(32))
-) engine=maria;
+) engine=aria;
 insert into t1 (id2, t) values
 (10, 'abc'), (10, 'abc'), (10, 'abc'),
 (20, 'abc'), (20, 'abc'), (20, 'def'),
@@ -852,10 +852,10 @@ a	b
 xxxxxxxxx	bbbbbb
 xxxxxxxxx	bbbbbb
 DROP TABLE t1;
-SET @@maria_repair_threads=2;
+SET @@aria_repair_threads=2;
-SHOW VARIABLES LIKE 'maria_repair%';
+SHOW VARIABLES LIKE 'aria_repair%';
 Variable_name	Value
-maria_repair_threads	2
+aria_repair_threads	2
 CREATE TABLE t1 (
 `_id` int(11) NOT NULL default '0',
 `url` text,
@@ -897,7 +897,7 @@ _id
 DELETE FROM t1 WHERE _id < 8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	MARIA	10	Page	2	#	#	#	#	0	#	#	#	#	#	#		
+t1	Aria	10	Page	2	#	#	#	#	0	#	#	#	#	#	#		
 CHECK TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -909,7 +909,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	MARIA	10	Page	2	#	#	#	#	0	#	#	#	#	#	#		
+t1	Aria	10	Page	2	#	#	#	#	0	#	#	#	#	#	#		
 SELECT _id FROM t1;
 _id
 8
@@ -956,7 +956,7 @@ _id
 DELETE FROM t1 WHERE _id < 8;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	MARIA	10	Page	2	#	#	#	#	0	#	#	#	#	#	#		
+t1	Aria	10	Page	2	#	#	#	#	0	#	#	#	#	#	#		
 CHECK TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -968,16 +968,16 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	MARIA	10	Page	2	#	#	#	#	0	#	#	#	#	#	#		
+t1	Aria	10	Page	2	#	#	#	#	0	#	#	#	#	#	#		
 SELECT _id FROM t1;
 _id
 8
 9
 DROP TABLE t1;
-SET @@maria_repair_threads=1;
+SET @@aria_repair_threads=1;
-SHOW VARIABLES LIKE 'maria_repair%';
+SHOW VARIABLES LIKE 'aria_repair%';
 Variable_name	Value
-maria_repair_threads	1
+aria_repair_threads	1
 drop table if exists t1,t2,t3;
 --- Testing varchar ---
 --- Testing varchar ---
@@ -997,7 +997,7 @@ t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
   `t` text
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 create table t2 like t1;
 show create table t2;
 Table	Create Table
@@ -1005,7 +1005,7 @@ t2	CREATE TABLE `t2` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
   `t` text
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 create table t3 select * from t1;
 show create table t3;
 Table	Create Table
@@ -1013,7 +1013,7 @@ t3	CREATE TABLE `t3` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
   `t` text
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 alter table t1 modify c varchar(10);
 show create table t1;
 Table	Create Table
@@ -1021,7 +1021,7 @@ t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 alter table t1 modify v char(10);
 show create table t1;
 Table	Create Table
@@ -1029,7 +1029,7 @@ t1	CREATE TABLE `t1` (
   `v` char(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` text
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 alter table t1 modify t varchar(10);
 Warnings:
 Note	1265	Data truncated for column 't' at row 2
@@ -1039,7 +1039,7 @@ t1	CREATE TABLE `t1` (
   `v` char(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
   `t` varchar(10) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+*+*+ *
@@ -1055,7 +1055,7 @@ t1	CREATE TABLE `t1` (
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 select count(*) from t1;
 count(*)
 270
@@ -1274,7 +1274,7 @@ t1	CREATE TABLE `t1` (
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 select count(*) from t1 where v='a';
 count(*)
 10
@@ -1354,7 +1354,7 @@ t1	CREATE TABLE `t1` (
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(30))
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 select count(*) from t1 where v='a';
 count(*)
 10
@@ -1434,7 +1434,7 @@ t1	CREATE TABLE `t1` (
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 select v,count(*) from t1 group by v limit 10;
 v	count(*)
 a
	1
@@ -1512,14 +1512,14 @@ t1	CREATE TABLE `t1` (
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (v char(10) character set utf8);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` char(10) CHARACTER SET utf8 DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (v varchar(10), c char(10)) row_format=fixed;
 show create table t1;
@@ -1527,7 +1527,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=FIXED
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=FIXED
 insert into t1 values('a','a'),('a ','a ');
 select concat('*',v,'*',c,'*') from t1;
 concat('*',v,'*',c,'*')
@@ -1560,7 +1560,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` mediumtext
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (v varchar(65530) character set utf8);
 Warnings:
@@ -1569,7 +1569,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` mediumtext CHARACTER SET utf8
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (v varchar(65535));
 ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
@@ -1696,32 +1696,32 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 INT, c2 INT, UNIQUE INDEX (c1), INDEX (c2));
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	MARIA	10	Page	0	#	#	#	8192	#	#	#	#	#	#	#		
+t1	Aria	10	Page	0	#	#	#	8192	#	#	#	#	#	#	#		
 INSERT INTO t1 VALUES (1,1);
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	MARIA	10	Page	1	#	#	#	24576	#	#	#	#	#	#	#		
+t1	Aria	10	Page	1	#	#	#	24576	#	#	#	#	#	#	#		
 ALTER TABLE t1 DISABLE KEYS;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	MARIA	10	Page	1	#	#	#	24576	#	#	#	#	#	#	#		
+t1	Aria	10	Page	1	#	#	#	24576	#	#	#	#	#	#	#		
 ALTER TABLE t1 ENABLE KEYS;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	MARIA	10	Page	1	#	#	#	24576	#	#	#	#	#	#	#		
+t1	Aria	10	Page	1	#	#	#	24576	#	#	#	#	#	#	#		
 ALTER TABLE t1 DISABLE KEYS;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	MARIA	10	Page	1	#	#	#	24576	#	#	#	#	#	#	#		
+t1	Aria	10	Page	1	#	#	#	24576	#	#	#	#	#	#	#		
 ALTER TABLE t1 ENABLE KEYS;
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	MARIA	10	Page	1	#	#	#	24576	#	#	#	#	#	#	#		
+t1	Aria	10	Page	1	#	#	#	24576	#	#	#	#	#	#	#		
 # Enable keys with parallel repair
-SET @@maria_repair_threads=2;
+SET @@aria_repair_threads=2;
 ALTER TABLE t1 DISABLE KEYS;
 ALTER TABLE t1 ENABLE KEYS;
-SET @@maria_repair_threads=1;
+SET @@aria_repair_threads=1;
 CHECK TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -1748,7 +1748,7 @@ id	ref
 3	2
 4	5
 DROP TABLE t1, t2;
-CREATE TABLE t1 (a INT) ENGINE=MARIA CHECKSUM=1 ROW_FORMAT=DYNAMIC;
+CREATE TABLE t1 (a INT) ENGINE=ARIA CHECKSUM=1 ROW_FORMAT=DYNAMIC;
 INSERT INTO t1 VALUES (0);
 UPDATE t1 SET a=1;
 SELECT a FROM t1;
@@ -1777,7 +1777,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
   KEY `a` (`a`) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a int not null, key `a` (a) key_block_size=2048);
 show create table t1;
@@ -1785,7 +1785,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
   KEY `a` (`a`) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a varchar(2048), key `a` (a));
 Warnings:
@@ -1795,7 +1795,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(2048) DEFAULT NULL,
   KEY `a` (`a`(1208))
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a varchar(2048), key `a` (a) key_block_size=1024);
 Warnings:
@@ -1805,7 +1805,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(2048) DEFAULT NULL,
   KEY `a` (`a`(1208)) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a int not null, b varchar(2048), key (a), key(b)) key_block_size=1024;
 Warnings:
@@ -1817,7 +1817,7 @@ t1	CREATE TABLE `t1` (
   `b` varchar(2048) DEFAULT NULL,
   KEY `a` (`a`) KEY_BLOCK_SIZE=8192,
   KEY `b` (`b`(1208)) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=1024
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=1024
 alter table t1 key_block_size=2048;
 show create table t1;
 Table	Create Table
@@ -1826,7 +1826,7 @@ t1	CREATE TABLE `t1` (
   `b` varchar(2048) DEFAULT NULL,
   KEY `a` (`a`) KEY_BLOCK_SIZE=8192,
   KEY `b` (`b`(1208)) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=2048
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=2048
 alter table t1 add c int, add key (c);
 show create table t1;
 Table	Create Table
@@ -1837,7 +1837,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`) KEY_BLOCK_SIZE=8192,
   KEY `b` (`b`(1208)) KEY_BLOCK_SIZE=8192,
   KEY `c` (`c`) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=2048
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=2048
 alter table t1 key_block_size=0;
 alter table t1 add d int, add key (d);
 show create table t1;
@@ -1851,7 +1851,7 @@ t1	CREATE TABLE `t1` (
   KEY `b` (`b`(1208)) KEY_BLOCK_SIZE=8192,
   KEY `c` (`c`) KEY_BLOCK_SIZE=8192,
   KEY `d` (`d`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a int not null, b varchar(2048), key (a), key(b)) key_block_size=8192;
 Warnings:
@@ -1863,7 +1863,7 @@ t1	CREATE TABLE `t1` (
   `b` varchar(2048) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`(1208))
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=8192
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=8192
 drop table t1;
 create table t1 (a int not null, b varchar(2048), key (a) key_block_size=1024, key(b)) key_block_size=8192;
 Warnings:
@@ -1875,7 +1875,7 @@ t1	CREATE TABLE `t1` (
   `b` varchar(2048) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`(1208))
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=8192
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=8192
 drop table t1;
 create table t1 (a int not null, b int, key (a) key_block_size=1024, key(b) key_block_size=8192) key_block_size=16384;
 show create table t1;
@@ -1885,7 +1885,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`) KEY_BLOCK_SIZE=8192,
   KEY `b` (`b`) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=16384
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 KEY_BLOCK_SIZE=16384
 drop table t1;
 create table t1 (a int not null, key `a` (a) key_block_size=512);
 show create table t1;
@@ -1893,7 +1893,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
   KEY `a` (`a`) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a varchar(2048), key `a` (a) key_block_size=1000000000000000000);
 Warnings:
@@ -1903,7 +1903,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(2048) DEFAULT NULL,
   KEY `a` (`a`(1208)) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a int not null, key `a` (a) key_block_size=1025);
 show create table t1;
@@ -1911,7 +1911,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
   KEY `a` (`a`) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a int not null, key key_block_size=1024 (a));
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=1024 (a))' at line 1
@@ -1965,7 +1965,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
 c1 CHAR(130),
 c2 VARCHAR(1)
-) ENGINE=maria;
+) ENGINE=aria;
 INSERT INTO t1 VALUES(REPEAT("a",128), 'b');
 SELECT COUNT(*) FROM t1;
 COUNT(*)
@@ -1986,7 +1986,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
 c1 CHAR(130),
 c2 VARCHAR(1)
-) ENGINE=maria;
+) ENGINE=aria;
 INSERT INTO t1 VALUES(REPEAT("a",128), 'b');
 SELECT COUNT(*) FROM t1;
 COUNT(*)
@@ -2007,7 +2007,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
 c1 CHAR(130),
 c2 VARCHAR(1)
-) ENGINE=maria;
+) ENGINE=aria;
 INSERT INTO t1 VALUES(REPEAT("a",128), 'b');
 INSERT INTO t1 VALUES('b', 'b');
 INSERT INTO t1 VALUES('c', 'b');
@@ -2026,13 +2026,13 @@ CREATE TABLE t1 (
 c1 CHAR(130),
 c2 VARCHAR(1),
 KEY (c1)
-) ENGINE=maria;
+) ENGINE=aria;
 # Insert 100 rows. Query log disabled.
 UPDATE t1 SET c1=REPEAT("a",128) LIMIT 90;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 100
-ALTER TABLE t1 ENGINE=maria;
+ALTER TABLE t1 ENGINE=aria;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 100
@@ -2046,7 +2046,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
 c1 CHAR(50),
 c2 VARCHAR(1)
-) ENGINE=maria DEFAULT CHARSET UTF8;
+) ENGINE=aria DEFAULT CHARSET UTF8;
 INSERT INTO t1 VALUES(REPEAT(_utf8 x'e0ae85',43), 'b');
 SELECT COUNT(*) FROM t1;
 COUNT(*)
@@ -2067,7 +2067,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
 c1 CHAR(50),
 c2 VARCHAR(1)
-) ENGINE=maria DEFAULT CHARSET UTF8;
+) ENGINE=aria DEFAULT CHARSET UTF8;
 INSERT INTO t1 VALUES(REPEAT(_utf8 x'e0ae85',43), 'b');
 SELECT COUNT(*) FROM t1;
 COUNT(*)
@@ -2088,7 +2088,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
 c1 CHAR(50),
 c2 VARCHAR(1)
-) ENGINE=maria DEFAULT CHARSET UTF8;
+) ENGINE=aria DEFAULT CHARSET UTF8;
 INSERT INTO t1 VALUES(REPEAT(_utf8 x'e0ae85',43), 'b');
 INSERT INTO t1 VALUES('b', 'b');
 INSERT INTO t1 VALUES('c', 'b');
@@ -2107,13 +2107,13 @@ CREATE TABLE t1 (
 c1 CHAR(50),
 c2 VARCHAR(1),
 KEY (c1)
-) ENGINE=maria DEFAULT CHARSET UTF8;
+) ENGINE=aria DEFAULT CHARSET UTF8;
 # Insert 100 rows. Query log disabled.
 UPDATE t1 SET c1=REPEAT(_utf8 x'e0ae85',43) LIMIT 90;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 100
-ALTER TABLE t1 ENGINE=maria;
+ALTER TABLE t1 ENGINE=aria;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 100
@@ -2130,8 +2130,8 @@ c2 CHAR(10) DEFAULT NULL,
 c3 VARCHAR(10) NOT NULL,
 KEY (c1),
 KEY (c2)
-) ENGINE=maria DEFAULT CHARSET=utf8 PACK_KEYS=0;
+) ENGINE=aria DEFAULT CHARSET=utf8 PACK_KEYS=0;
-MARIA file:          MYSQLD_DATADIR/test/t1
+Aria file:          MYSQLD_DATADIR/test/t1
 Record format:       Block
 Crashsafe:           yes
 Character set:       utf8_general_ci (33)
@@ -2150,14 +2150,14 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `n` int(11) NOT NULL,
   `c` char(1) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 TRANSACTIONAL=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 TRANSACTIONAL=1
 drop table t1;
-CREATE TABLE t1 (line LINESTRING NOT NULL) engine=maria;
+CREATE TABLE t1 (line LINESTRING NOT NULL) engine=aria;
 INSERT INTO t1 VALUES (GeomFromText("POINT(0 0)"));
 checksum table t1;
 Table	Checksum
 test.t1	326284887
-CREATE TABLE t2 (line LINESTRING NOT NULL) engine=maria;
+CREATE TABLE t2 (line LINESTRING NOT NULL) engine=aria;
 INSERT INTO t2 VALUES (GeomFromText("POINT(0 0)"));
 checksum table t2;
 Table	Checksum
@@ -2168,7 +2168,7 @@ Table	Checksum
 test.t3	326284887
 drop table t1,t2,t3;
 End of 5.1 tests
-create table t2(a varchar(255),key(a))engine=maria row_format=dynamic transactional=0;
+create table t2(a varchar(255),key(a))engine=aria row_format=dynamic transactional=0;
 insert into t2 values (repeat('o',124)), (repeat('h',226)), (repeat('i',236)),
 (repeat('l',234)), (repeat('b',13)), (repeat('g',236)), (repeat('y',205)),
 (repeat('c',99)), (repeat('g',145)), (repeat('o',131)), (repeat('e',63)),
@@ -2380,7 +2380,7 @@ col172 tinyint(1) DEFAULT NULL,
 col173 tinytext,
 col174 decimal(10,0) DEFAULT NULL,
 col175 double DEFAULT NULL
-) engine=maria;
+) engine=aria;
 insert ignore into t1 set 
 col10=abs(28449) % 2,
 col11='1973',
@@ -2505,7 +2505,7 @@ check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 drop table t1;
-create table t1 (a char(200) primary key, b int default 12345) engine=maria;
+create table t1 (a char(200) primary key, b int default 12345) engine=aria;
 insert t1 (a) values (repeat('0', 200));
 insert t1 (a) values (repeat('1', 200)), (repeat('2', 200)), (repeat('3', 200)),
 (repeat('4', 200)), (repeat('5', 200)), (repeat('6', 200)), (repeat('7', 200)),
@@ -2525,14 +2525,14 @@ b
 12345
 12345
 drop table t1;
-create table t1 (a int) engine=maria transactional=1;
+create table t1 (a int) engine=aria transactional=1;
 insert into t1 values (1);
 lock table t1 write concurrent;
 delete from t1;
 ERROR 42000: The storage engine for the table doesn't support DELETE in WRITE CONCURRENT
 drop table t1;
 create table t1 (p int primary key, i int, a char(10), key k1(i), key k2(a))
-engine maria;
+engine aria;
 insert into t1 values (1, 1, 'qqqq'), (2, 1, 'pppp'),
 (3, 1, 'yyyy'), (4, 3, 'zzzz');
 insert into t1 values (5, 3, 'yyyy'), (6, 3, 'yyyy'), (7, 0, NULL),
@@ -2563,8 +2563,8 @@ check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 drop table t1;
-create table t1 (f1 int unique, f2 int) engine=maria;
+create table t1 (f1 int unique, f2 int) engine=aria;
-create table t2 (f3 int, f4 int) engine=maria;
+create table t2 (f3 int, f4 int) engine=aria;
 create view v1 as select * from t1, t2 where f1= f3;
 insert into t1 values (1,11), (2,22);
 insert into v1 (f1) values (3) on duplicate key update f1= f3 + 10;
@@ -2573,7 +2573,7 @@ insert into v1 (f1) values (3) on duplicate key update f1= f3 + 10;
 ERROR HY000: Can not modify more than one base table through a join view 'test.v1'
 drop table t1,t2;
 drop view v1;
-CREATE TABLE t1 (id int, c varchar(10)) engine=maria;
+CREATE TABLE t1 (id int, c varchar(10)) engine=aria;
 INSERT INTO t1 VALUES (1,"1");
 ALTER TABLE t1 CHANGE c d varchar(10);
 affected rows: 0
@@ -2590,7 +2590,7 @@ lock table t1 read, t2 read;
 flush tables with read lock;
 unlock tables;
 drop table t1, t2;
-create table t1(a int primary key, b blob, c blob) engine=maria;
+create table t1(a int primary key, b blob, c blob) engine=aria;
 insert into t1 values(1,repeat('a',100), repeat('b',657860));
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 1
@@ -2605,7 +2605,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 CREATE TABLE t1 ( f1 DOUBLE , f2 DOUBLE , f3 DOUBLE , f4 DOUBLE , v3 DOUBLE , v4 DOUBLE , KEY ( v3 ) , KEY ( v4 ) ) engine=maria;
 REPLACE t1 ( f2 , f1 ) VALUES ( f2 , 56 ) ;

mysql-test/suite/maria/r/maria2.result

@@ -3,7 +3,7 @@ CREATE TABLE t1 (
 line BLOB,
 kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po',
 name VARCHAR(32)
-) transactional=0 row_format=page engine=maria;
+) transactional=0 row_format=page engine=aria;
 select count(*) from t1;
 count(*)
 810
@@ -17,8 +17,8 @@ check table t1 extended;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 drop table t1;
-create table t1 (i int) engine=maria;
+create table t1 (i int) engine=aria;
-create table t2 (j int) engine=maria;
+create table t2 (j int) engine=aria;
 lock table t1 write, t2 read;
 alter table t1 modify i int default 1;
 insert into t1 values (2);
@@ -30,7 +30,7 @@ select * from t1;
 i
 2
 drop table t1,t2;
-create table t1(id int, s char(1), unique(s)) engine=maria;
+create table t1(id int, s char(1), unique(s)) engine=aria;
 insert into t1 values(1,"a") on duplicate key update t1.id=t1.id+1;
 insert into t1 values(1,"a") on duplicate key update t1.id=t1.id+1;
 insert into t1 select 1,"a" on duplicate key update t1.id=t1.id+1;
@@ -42,7 +42,7 @@ select * from t1;
 id	s
 1	a
 drop table t1;
-create table t1 (pk int primary key, apk int unique, data int) engine=maria;
+create table t1 (pk int primary key, apk int unique, data int) engine=aria;
 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);
 select * from t1 order by pk;

mysql-test/suite/maria/r/maria3.result

@@ -1,10 +1,10 @@
-select * from INFORMATION_SCHEMA.ENGINES where ENGINE="MARIA";
+select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA";
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
-MARIA	YES	Crash-safe tables with MyISAM heritage	YES	NO	NO
+Aria	YES	Crash-safe tables with MyISAM heritage	YES	NO	NO
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
-set global maria_page_checksum=0;
+set global aria_page_checksum=0;
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 drop table if exists t1,t2;
 SET SQL_WARNINGS=1;
 create table t1 (a int not null, key `a` (a) key_block_size=512);
@@ -13,7 +13,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
   KEY `a` (`a`) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a varchar(2048), key `a` (a) key_block_size=1000000000000000000);
 Warnings:
@@ -23,7 +23,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(2048) DEFAULT NULL,
   KEY `a` (`a`(1208)) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a int not null, key `a` (a) key_block_size=1025);
 show create table t1;
@@ -31,7 +31,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
   KEY `a` (`a`) KEY_BLOCK_SIZE=8192
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a int not null, key key_block_size=1024 (a));
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=1024 (a))' at line 1
@@ -87,14 +87,14 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 TRANSACTIONAL=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 TRANSACTIONAL=0
 drop table t1;
 create table t1 (a int) row_format=dynamic transactional=0;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=DYNAMIC TRANSACTIONAL=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=DYNAMIC TRANSACTIONAL=0
 drop table t1;
 create table t1 (a int) row_format=dynamic transactional=1;
 Warnings:
@@ -103,13 +103,13 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE TRANSACTIONAL=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE TRANSACTIONAL=1
 alter table t1 row_format=PAGE;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE TRANSACTIONAL=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE TRANSACTIONAL=1
 alter table t1 row_format=DYNAMIC;
 Warnings:
 Note	1478	Row format set to PAGE because of TRANSACTIONAL=1 option
@@ -117,46 +117,46 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE TRANSACTIONAL=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE TRANSACTIONAL=1
 alter table t1 transactional=0;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=DYNAMIC TRANSACTIONAL=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=DYNAMIC TRANSACTIONAL=0
 alter table t1 row_format=DYNAMIC;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=DYNAMIC TRANSACTIONAL=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=DYNAMIC TRANSACTIONAL=0
 drop table t1;
 create table t1 (a int) row_format=PAGE;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE
 drop table t1;
 create table t1 (a int) row_format=PAGE TRANSACTIONAL=DEFAULT;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE
 alter table t1 row_format=DYNAMIC;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=DYNAMIC
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=DYNAMIC
 drop table t1;
 create table t1 (a int) transactional=0 row_format=FIXED;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=FIXED TRANSACTIONAL=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=FIXED TRANSACTIONAL=0
 alter table t1 transactional=1;
 Warnings:
 Note	1478	Row format set to PAGE because of TRANSACTIONAL=1 option
@@ -164,20 +164,20 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE TRANSACTIONAL=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE TRANSACTIONAL=1
 alter table t1 transactional=0;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=FIXED TRANSACTIONAL=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=FIXED TRANSACTIONAL=0
 drop table t1;
 create table t1 (a int) transactional=0 row_format=FIXED;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=FIXED TRANSACTIONAL=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=FIXED TRANSACTIONAL=0
 alter table t1 transactional=1;
 Warnings:
 Note	1478	Row format set to PAGE because of TRANSACTIONAL=1 option
@@ -185,20 +185,20 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE TRANSACTIONAL=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=PAGE TRANSACTIONAL=1
 alter table t1 transactional=0;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=FIXED TRANSACTIONAL=0
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 ROW_FORMAT=FIXED TRANSACTIONAL=0
 drop table t1;
 create table `t1` (
 t1_name varchar(255) default null,
 t1_id int(10) unsigned not null auto_increment,
 key (t1_name),
 primary key (t1_id)
-) engine=maria auto_increment = 1000 default charset=latin1;
+) engine=aria auto_increment = 1000 default charset=latin1;
 lock tables t1 write;
 INSERT INTO `t1` VALUES ('bla',1000),('bla',1001),('bla',1002);
 check table t1;
@@ -226,7 +226,7 @@ check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 drop table t1;
-CREATE TABLE t1 (a int, b int, v varchar(60000)) checksum=1 engine=maria;
+CREATE TABLE t1 (a int, b int, v varchar(60000)) checksum=1 engine=aria;
 insert into t1 values (1,1,"aaa"),(1,2,null);
 checksum table t1;
 Table	Checksum
@@ -278,9 +278,9 @@ KEY (umedium),
 KEY (ulong),
 KEY (ulonglong,ulong),
 KEY (options,flags)
-) engine=maria;
+) engine=aria;
 insert into t1 values (10,1,1,1,1,1,1,1,1,1,1,1,1,1,NULL,0,0,0,1,1,1,1,'one','one');
-create table t2 (primary key (auto)) engine=maria row_format=page select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
+create table t2 (primary key (auto)) engine=aria row_format=page select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
 check table t1,t2;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -289,7 +289,7 @@ select t1,t2,length(t3),length(t4),length(t5),length(t6),t7,t8 from t2;
 t1	t2	length(t3)	length(t4)	length(t5)	length(t6)	t7	t8
 1	a	256	256	4096	4096		
 drop table t2;
-create table t2 (primary key (auto)) engine=maria row_format=dynamic select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
+create table t2 (primary key (auto)) engine=aria row_format=dynamic select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
 check table t2;
 Table	Op	Msg_type	Msg_text
 test.t2	check	status	OK
@@ -301,35 +301,35 @@ check table t1 extended;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 drop table t1;
-select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "maria%" and variable_name not like "maria_used_for_temp_tables" order by 1;
+select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "aria%" and variable_name not like "aria_used_for_temp_tables" order by 1;
 Variable_name	Value
-maria_block_size	8192
+aria_block_size	8192
-maria_checkpoint_interval	30
+aria_checkpoint_interval	30
-maria_force_start_after_recovery_failures	0
+aria_force_start_after_recovery_failures	0
-maria_group_commit	none
+aria_group_commit	none
-maria_group_commit_interval	0
+aria_group_commit_interval	0
-maria_log_file_size	4294959104
+aria_log_file_size	4294959104
-maria_log_purge_type	immediate
+aria_log_purge_type	immediate
-maria_max_sort_file_size	9223372036853727232
+aria_max_sort_file_size	9223372036853727232
-maria_pagecache_age_threshold	300
+aria_pagecache_age_threshold	300
-maria_pagecache_buffer_size	134213632
+aria_pagecache_buffer_size	134213632
-maria_pagecache_division_limit	100
+aria_pagecache_division_limit	100
-maria_page_checksum	OFF
+aria_page_checksum	OFF
-maria_recover	NORMAL
+aria_recover	NORMAL
-maria_repair_threads	1
+aria_repair_threads	1
-maria_sort_buffer_size	134217728
+aria_sort_buffer_size	134217728
-maria_stats_method	nulls_unequal
+aria_stats_method	nulls_unequal
-maria_sync_log_dir	NEWFILE
+aria_sync_log_dir	NEWFILE
-show status like 'maria%';
+show status like 'aria%';
 Variable_name	Value
-Maria_pagecache_blocks_not_flushed	#
+Aria_pagecache_blocks_not_flushed	#
-Maria_pagecache_blocks_unused	#
+Aria_pagecache_blocks_unused	#
-Maria_pagecache_blocks_used	#
+Aria_pagecache_blocks_used	#
-Maria_pagecache_read_requests	#
+Aria_pagecache_read_requests	#
-Maria_pagecache_reads	#
+Aria_pagecache_reads	#
-Maria_pagecache_write_requests	#
+Aria_pagecache_write_requests	#
-Maria_pagecache_writes	#
+Aria_pagecache_writes	#
-Maria_transaction_log_syncs	#
+Aria_transaction_log_syncs	#
 create table t1 (b char(0));
 insert into t1 values(NULL),("");
 select length(b) from t1;
@@ -385,15 +385,15 @@ drop table t1;
 CREATE TABLE t1 (col1 int, s1 char(16) DEFAULT NULL, s2 char(16) DEFAULT NULL, KEY (s1,s2));
 insert into t1 (col1) values(0);
 drop table t1;
-set global maria_page_checksum=1;
+set global aria_page_checksum=1;
 create table t1 (a int);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 drop table t1;
-set global maria_log_file_size=4294967296;
+set global aria_log_file_size=4294967296;
 Warnings:
 Warning	1292	Truncated incorrect log_file_size value: '4294967296'
 create table t1 (a int not null);
@@ -415,7 +415,7 @@ create table t3 select * from t1, t2;
 ERROR 42S21: Duplicate column name 'c'
 create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1, t2;
 drop table t1, t2, t3;
-create table t1 (t datetime) engine=maria;
+create table t1 (t datetime) engine=aria;
 insert into t1 values (101),(691231),(700101),(991231),(10000101),(99991231),(101000000),(691231000000),(700101000000),(991231235959),(10000101000000),(99991231235959),(20030100000000),(20030000000000);
 select * from t1;
 t
@@ -500,38 +500,38 @@ n	c
 301	c
 302	d
 drop table t1;
-create table t1 (n int not null, c char(1)) engine=maria;
+create table t1 (n int not null, c char(1)) engine=aria;
 alter table t1 engine=myisam;
-alter table t1 engine=maria;
+alter table t1 engine=aria;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `n` int(11) NOT NULL,
   `c` char(1) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 drop table t1;
-create table t1 (n int not null, c char(1)) engine=maria transactional=1;
+create table t1 (n int not null, c char(1)) engine=aria transactional=1;
 alter table t1 engine=myisam;
 Warnings:
 Error	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
-alter table t1 engine=maria;
+alter table t1 engine=aria;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `n` int(11) NOT NULL,
   `c` char(1) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1
 drop table t1;
 create table t1 (n int not null, c char(1)) engine=myisam transactional=1;
 Warnings:
 Error	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
-alter table t1 engine=maria;
+alter table t1 engine=aria;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `n` int(11) NOT NULL,
   `c` char(1) DEFAULT NULL
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1
 drop table t1;
 create table t1 (a int, key(a)) transactional=0;
 insert into t1 values (0),(1),(2),(3),(4);
@@ -603,17 +603,17 @@ SELECT a FROM t1 WHERE MATCH a AGAINST ('+city (of)*' IN BOOLEAN MODE);
 a
 City Of God
 DROP TABLE t1;
-create table t1(a int) engine=maria transactional=1;
+create table t1(a int) engine=aria transactional=1;
 select CREATE_OPTIONS from information_schema.TABLES where
 TABLE_SCHEMA='test' and TABLE_NAME='t1';
 CREATE_OPTIONS
 transactional=1
 drop table t1;
-create table t1 (a int, unique(a)) engine=maria transactional=1;
+create table t1 (a int, unique(a)) engine=aria transactional=1;
 insert into t1 values(1);
 insert into t1 values(2),(2);
 ERROR 23000: Duplicate entry '2' for key 'a'
-create table t2 (a int, unique(a)) engine=maria transactional=0 row_format=dynamic;
+create table t2 (a int, unique(a)) engine=aria transactional=0 row_format=dynamic;
 insert into t2 values(1);
 insert into t2 values(2),(2);
 ERROR 23000: Duplicate entry '2' for key 'a'

mysql-test/suite/maria/r/maria_notembedded.result

@@ -1,4 +1,4 @@
-set session storage_engine=maria;
+set session storage_engine=aria;
 create table t1 (a int) row_format=page;
 insert delayed into t1 values(1);
 ERROR HY000: DELAYED option not supported for table 't1'

mysql-test/suite/maria/r/maria_partition.result

@@ -1,6 +1,6 @@
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
-set global maria_page_checksum=0;
+set global aria_page_checksum=0;
 drop table if exists t1,t2;
 drop view if exists v1;
 SET SQL_WARNINGS=1;
@@ -9,8 +9,8 @@ insert into t1 values (1);
 alter table t1 partition by list (s1) (partition p1 values in (2));
 ERROR HY000: Table has no partition for value 1
 drop table t1;
-create table t2(a blob) engine=maria;
+create table t2(a blob) engine=aria;
-create table t1(a int primary key) engine=maria;
+create table t1(a int primary key) engine=aria;
 insert into t2 values ('foo'),('bar');
 select * from t2 left join t1 on (t2.a=t1.a) where t2.a='bbb';
 a	a

mysql-test/suite/maria/r/maria_showlog_error.result

@@ -1,5 +1,5 @@
 * shut down mysqld, removed logs, restarted it
-show engine maria logs;
+show engine aria logs;
 Type	Name	Status
-MARIA	Size unknown ; maria_log.00000001	can't stat
+Aria	Size unknown ; aria_log.00000001	can't stat
 * shut down mysqld, removed logs, restarted it

mysql-test/suite/maria/r/ps_maria.result

@@ -4,7 +4,7 @@ create table t1
 (
 a int, b varchar(30),
 primary key(a)
-) engine = 'MARIA'  ;
+) engine = 'ARIA'  ;
 create table t9 
 (
 c1  tinyint, c2  smallint, c3  mediumint, c4  int,
@@ -17,7 +17,7 @@ c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
 c29 longblob, c30 longtext, c31 enum('one', 'two', 'three'),
 c32 set('monday', 'tuesday', 'wednesday'),
 primary key(c1)
-) engine = 'MARIA'  ;
+) engine = 'ARIA'  ;
 delete from t1 ;
 insert into t1 values (1,'one');
 insert into t1 values (2,'two');
@@ -1166,7 +1166,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2	
 drop table if exists t2 ;
 create table t2 (s varchar(25), fulltext(s)) TRANSACTIONAL= 0
-ENGINE = 'MARIA'  ;
+ENGINE = 'ARIA'  ;
 insert into t2 values ('Gravedigger'), ('Greed'),('Hollow Dogs') ;
 commit ;
 prepare stmt1 from ' select s from t2 where match (s) against (?) ' ;
@@ -1352,7 +1352,7 @@ create table t2
 (
 a int, b varchar(30),
 primary key(a)
-) engine = 'MARIA'  ;
+) engine = 'ARIA'  ;
 insert into t2(a,b) select a, b from t1 ;
 prepare stmt1 from 'update t1 set a=? where b=?
                     and a in (select ? from t2
@@ -1542,7 +1542,7 @@ execute stmt1 using @arg00, @arg01;
 ERROR 23000: Duplicate entry '82' for key 'PRIMARY'
 drop table if exists t2 ;
 create table t2 (id int auto_increment primary key) 
-ENGINE= 'MARIA'  ;
+ENGINE= 'ARIA'  ;
 prepare stmt1 from ' select last_insert_id() ' ;
 insert into t2 values (NULL) ;
 execute stmt1 ;

mysql-test/suite/maria/t/group_commit.test

@@ -7,8 +7,8 @@ drop table if exists t1;
 
 create table t1 (a int);
 
-SET GLOBAL maria_group_commit="NONE";
+SET GLOBAL aria_group_commit="NONE";
-SET GLOBAL maria_group_commit_interval= 0;
+SET GLOBAL aria_group_commit_interval= 0;
 --disable_query_log
 let $num = 5000;
 while ($num)
@@ -17,8 +17,8 @@ while ($num)
   dec $num;
 }
 --enable_query_log
-SET GLOBAL maria_group_commit="NONE";
+SET GLOBAL aria_group_commit="NONE";
-SET GLOBAL maria_group_commit_interval= 100;
+SET GLOBAL aria_group_commit_interval= 100;
 --disable_query_log
 let $num = 5000;
 while ($num)
@@ -27,8 +27,8 @@ while ($num)
   dec $num;
 }
 --enable_query_log
-SET GLOBAL maria_group_commit="HARD";
+SET GLOBAL aria_group_commit="HARD";
-SET GLOBAL maria_group_commit_interval= 0;
+SET GLOBAL aria_group_commit_interval= 0;
 --disable_query_log
 let $num = 5000;
 while ($num)
@@ -37,8 +37,8 @@ while ($num)
   dec $num;
 }
 --enable_query_log
-SET GLOBAL maria_group_commit="HARD";
+SET GLOBAL aria_group_commit="HARD";
-SET GLOBAL maria_group_commit_interval= 100;
+SET GLOBAL aria_group_commit_interval= 100;
 --disable_query_log
 let $num = 5000;
 while ($num)
@@ -47,8 +47,8 @@ while ($num)
   dec $num;
 }
 --enable_query_log
-SET GLOBAL maria_group_commit="SOFT";
+SET GLOBAL aria_group_commit="SOFT";
-SET GLOBAL maria_group_commit_interval= 0;
+SET GLOBAL aria_group_commit_interval= 0;
 --disable_query_log
 let $num = 5000;
 while ($num)
@@ -57,8 +57,8 @@ while ($num)
   dec $num;
 }
 --enable_query_log
-SET GLOBAL maria_group_commit="SOFT";
+SET GLOBAL aria_group_commit="SOFT";
-SET GLOBAL maria_group_commit_interval= 100;
+SET GLOBAL aria_group_commit_interval= 100;
 --disable_query_log
 let $num = 5000;
 while ($num)
@@ -67,6 +67,6 @@ while ($num)
   dec $num;
 }
 --enable_query_log
-SET GLOBAL maria_group_commit="NONE";
+SET GLOBAL aria_group_commit="NONE";
-SET GLOBAL maria_group_commit_interval= 0;
+SET GLOBAL aria_group_commit_interval= 0;
 drop table t1;

mysql-test/suite/maria/t/maria-autozerofill.test

@@ -1,5 +1,5 @@
 # Test to verify that auto-zerofilling happens when a table is
-# imported from a different Maria instance
+# imported from a different Aria instance
 
 # can't restart in embedded
 --source include/not_embedded.inc
@@ -20,16 +20,16 @@ connection default;
 use mysqltest;
 --enable_reconnect
 
-create table t1(a int) engine=maria;
+create table t1(a int) engine=aria;
 insert into t1 values(1);
 flush table t1;
 # Check that table is not zerofilled, not movable
 let $MYSQLD_DATADIR= `select @@datadir`;
---exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt
 perl;
     use strict;
     use warnings;
-    my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/mariachk.txt";
+    my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/ariachk.txt";
     open(FILE, "<", $fname) or die;
     my @content= <FILE>;
     print grep(/Status:.*(zerofilled|movable)/, @content);
@@ -37,23 +37,23 @@ perl;
     close FILE;
 EOF
 
-# this will remove control file, so change the uuid of the Maria
+# this will remove control file, so change the uuid of the Aria
 # instance, thus t1 will appear as imported from elsewhere.
 
 -- source include/maria_empty_logs.inc
 
-disable_ps_protocol; # see maria-recover.test
+disable_ps_protocol; # see aria-recover.test
 replace_regex /Table.*t1/t1/ ;
 select * from t1;
 enable_ps_protocol;
 flush table t1;
 
 # Check that table is auto-zerofilled, movable
---exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt
 perl;
     use strict;
     use warnings;
-    my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/mariachk.txt";
+    my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/ariachk.txt";
     open(FILE, "<", $fname) or die;
     my @content= <FILE>;
     print grep(/Status:.*zerofilled/, @content);
@@ -61,16 +61,16 @@ perl;
     close FILE;
 EOF
 
-# this will attach t1 to the current Maria instance
+# this will attach t1 to the current Aria instance
 insert into t1 values(2);
 flush table t1;
 
 # Check that table is not zerofilled, not movable
---exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
+--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt
 perl;
     use strict;
     use warnings;
-    my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/mariachk.txt";
+    my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/ariachk.txt";
     open(FILE, "<", $fname) or die;
     my @content= <FILE>;
     print grep(/Status:.*(zerofilled|movable)/, @content);

mysql-test/suite/maria/t/maria-big.test

@@ -9,7 +9,7 @@ connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 connection root;
 
 enable_info;
-set storage_engine=maria;
+set storage_engine=aria;
 disable_warnings;
 drop table if exists t1, t2;
 enable_warnings;
@@ -68,7 +68,7 @@ drop table t1;
 # Set defaults back
 --disable_result_log
 --disable_query_log
-set global maria_log_file_size=default;
+set global aria_log_file_size=default;
 set global max_allowed_packet=default;
 --enable_result_log
 --enable_query_log

mysql-test/suite/maria/t/maria-big2.test

@@ -5,7 +5,7 @@
 # (CHECK TABLE said Invalid key block position: 15731098820608  key
 # block size: 8192  file_length: 425984)
 
-create table t2(id int,a varchar(255),b varchar(255),key(a))engine=maria row_format=dynamic transactional=0;
+create table t2(id int,a varchar(255),b varchar(255),key(a))engine=aria row_format=dynamic transactional=0;
 
 disable_query_log;
 insert into t2(a,b) values ('zmysnptvgzljpaumbdhrzkmbhefugcyhncbl','urecietrsfhgusavxffpdszrfcpdqbwxzvygsuwammwunjhpxanvozwnngnnjbwfenjgosaixpccjyviiutzpxkwiecuprltzrpxvkrjnjqgsneniewbagpvwelajvnckbbkqpaicxor')

mysql-test/suite/maria/t/maria-connect.test

@@ -6,8 +6,8 @@
 -- source include/have_log_bin.inc
 
 let $default=`select @@global.storage_engine`;
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
 
 # Initialise
 --disable_warnings
@@ -18,7 +18,7 @@ SET SQL_WARNINGS=1;
 #
 # UNIQUE key test
 #
-# as long as maria cannot rollback, binlog should contain both inserts
+# as long as aria cannot rollback, binlog should contain both inserts
 #
 RESET MASTER;
 set binlog_format=statement;
@@ -36,6 +36,6 @@ set binlog_format=default;
 --disable_result_log
 --disable_query_log
 eval set global storage_engine=$default;
-set global maria_log_file_size=default;
+set global aria_log_file_size=default;
 --enable_result_log
 --enable_query_log

mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test

@@ -1,7 +1,7 @@
 -- source include/have_maria.inc
 -- source include/have_geometry.inc
 
-set storage_engine=maria;
+set storage_engine=aria;
 
 #
 # test of rtree (using with spatial data)

mysql-test/suite/maria/t/maria-gis-rtree-trans.test

@@ -1,10 +1,10 @@
 # Because state.key_root is updated differently between transactional
-# and non-trans tables, we have several maria-gis-rtree-* tests.
+# and non-trans tables, we have several aria-gis-rtree-* tests.
 
 -- source include/have_maria.inc
 -- source include/have_geometry.inc
 
-set storage_engine=maria;
+set storage_engine=aria;
 
 #
 # test of rtree (using with spatial data)

mysql-test/suite/maria/t/maria-gis-rtree.test

@@ -1,7 +1,7 @@
 -- source include/have_maria.inc
 -- source include/have_geometry.inc
 
-set storage_engine=maria;
+set storage_engine=aria;
 
 #
 # test of rtree (using with spatial data)

mysql-test/suite/maria/t/maria-mvcc.test

@@ -4,7 +4,7 @@
 #
 
 -- source include/have_maria.inc
-set global maria_page_checksum=1;
+set global aria_page_checksum=1;
 
 --disable_warnings
 drop table if exists t1;
@@ -13,7 +13,7 @@ drop table if exists t1;
 connect (con1,localhost,root,,);
 connection con1;
 
-create table t1 (i int) engine=maria;
+create table t1 (i int) engine=aria;
 show create table t1;
 
 # versioning is disabled when table is empty, so insert a row
@@ -94,7 +94,7 @@ drop table t1;
 # Test count(*) for not versioned tables
 #
 
-CREATE TABLE t1 (fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,    g GEOMETRY NOT NULL,   SPATIAL KEY(g) ) transactional=1 row_format=page engine=maria;
+CREATE TABLE t1 (fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,    g GEOMETRY NOT NULL,   SPATIAL KEY(g) ) transactional=1 row_format=page engine=aria;
 
 lock tables t1 write concurrent, t1 as t2 write concurrent;
 insert into t1 (fid,g) values (NULL,GeomFromText('LineString(0 0,1 1)'));

mysql-test/suite/maria/t/maria-no-logging.test

@@ -4,7 +4,7 @@
 # can't restart server in embedded
 --source include/not_embedded.inc
 
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 
 --disable_warnings
 drop database if exists mysqltest;
@@ -19,8 +19,8 @@ use mysqltest;
 --enable_reconnect
 
 # checkpoints can make log unrepeatable
-let $def_checkinterval=`select @@global.maria_checkpoint_interval`;
+let $def_checkinterval=`select @@global.aria_checkpoint_interval`;
-set global maria_checkpoint_interval=0;
+set global aria_checkpoint_interval=0;
 
 # Prepare table to help for big load
 create table t2 (a varchar(100)) engine=myisam;
@@ -36,24 +36,24 @@ insert into t2 select * from t2;
 
 # no optimization because table not empty
 
-# SHOW ENGINE MARIA LOGS could be influenced by older logs
+# SHOW ENGINE ARIA LOGS could be influenced by older logs
 -- source include/maria_empty_logs.inc
-create table t1 (a varchar(100)) engine=maria transactional=1;
+create table t1 (a varchar(100)) engine=aria transactional=1;
 show create table t1;
---replace_regex /; .+maria_log/maria_log/
+--replace_regex /; .+aria_log/aria_log/
-show engine maria logs;
+show engine aria logs;
 
 insert into t1 values('a');
 insert into t1 select * from t2;
---replace_regex /; .+maria_log/maria_log/
+--replace_regex /; .+aria_log/aria_log/
-show engine maria logs;
+show engine aria logs;
 
 # optimization because table is empty
 -- source include/maria_empty_logs.inc
 truncate table t1;
 insert into t1 select * from t2;
---replace_regex /; .+maria_log/maria_log/
+--replace_regex /; .+aria_log/aria_log/
-show engine maria logs;
+show engine aria logs;
 
 drop table t1;
 
@@ -61,23 +61,23 @@ drop table t1;
 
 # no optimization because table not empty
 -- source include/maria_empty_logs.inc
-create table t1 (a varchar(100)) engine=maria transactional=1;
+create table t1 (a varchar(100)) engine=aria transactional=1;
 insert into t1 values('a');
 create table if not exists t1 select * from t2;
---replace_regex /; .+maria_log/maria_log/
+--replace_regex /; .+aria_log/aria_log/
-show engine maria logs;
+show engine aria logs;
 
 # optimization because table is empty
 -- source include/maria_empty_logs.inc
 drop table t1;
-create table t1 engine=maria transactional=1 select * from t2;
+create table t1 engine=aria transactional=1 select * from t2;
---replace_regex /; .+maria_log/maria_log/
+--replace_regex /; .+aria_log/aria_log/
-show engine maria logs;
+show engine aria logs;
 
 drop database mysqltest;
 
 --disable_result_log
 --disable_query_log
-eval set global maria_checkpoint_interval=$def_checkinterval;
+eval set global aria_checkpoint_interval=$def_checkinterval;
 --enable_result_log
 --enable_query_log

mysql-test/suite/maria/t/maria-partitioning.test

@@ -1,21 +1,21 @@
 #
-# Testing of potential problems in Maria with partitioning
+# Testing of potential problems in Aria with partitioning
 #
 
 --source include/have_maria.inc
 --source include/have_partition.inc
 
 let $default_engine=`select @@global.storage_engine`;
-let $default_checksum=`select @@global.maria_page_checksum`;
+let $default_checksum=`select @@global.aria_page_checksum`;
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
 
 #
 # Test outer join const propagation
 #
 DROP TABLE if exists t1,t2;
-create table t2(a blob) engine=maria;
+create table t2(a blob) engine=aria;
-create table t1(a int primary key) engine=maria;
+create table t1(a int primary key) engine=aria;
 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);
@@ -24,8 +24,8 @@ 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) engine= maria;
+create table t2(a blob) engine= aria;
-create table t1(a int primary key) engine= maria PARTITION BY HASH (a) PARTITIONS 2;
+create table t1(a int primary key) engine= aria 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);

mysql-test/suite/maria/t/maria-preload.test

@@ -11,15 +11,15 @@ drop table if exists t1, t2;
 --enable_warnings
 
 # Background dirty pages flushing may influence page cache stats:
-let $def_checkinterval=`select @@global.maria_checkpoint_interval`;
+let $def_checkinterval=`select @@global.aria_checkpoint_interval`;
-set global maria_checkpoint_interval=0;
+set global aria_checkpoint_interval=0;
 
 # Work around BUG#34911 "FLUSH STATUS doesn't flush what it should":
 # compute differences in status variables before and after relevant
-# queries. Maria_pagecache_read_requests varies accross machines.
+# queries. Aria_pagecache_read_requests varies accross machines.
 create temporary table initial
 select variable_name,variable_value from
-information_schema.global_status where variable_name like "Maria_pagecache_reads";
+information_schema.global_status where variable_name like "Aria_pagecache_reads";
 
 # we don't use block-format because we want page cache stats
 # about indices and not data pages.
@@ -29,14 +29,14 @@ create table t1 (
   b char(16) not null,
   primary key (a),
   key (b)
-) engine=maria row_format=dynamic;
+) engine=aria row_format=dynamic;
 
 create table t2(
   a int not null auto_increment,
   b char(16) not null,
   primary key (a),
   key (b)
-) engine=maria row_format=dynamic;
+) engine=aria row_format=dynamic;
 
 insert into t1(b) values 
   ('test0'),
@@ -71,7 +71,7 @@ select count(*) from t1;
 select count(*) from t2;
 
 flush tables; flush status;
-let $show_stat=select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
+let $show_stat=select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Aria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
 eval $show_stat;
 select count(*) from t1 where b = 'test1';
 eval $show_stat;
@@ -116,11 +116,11 @@ eval $show_stat;
 drop table t1, t2;
 drop temporary table initial;
 
-# check that Maria didn't use key cache
+# check that Aria didn't use key cache
 show status like "key_read%";
 
 --disable_result_log
 --disable_query_log
-eval set global maria_checkpoint_interval=$def_checkinterval;
+eval set global aria_checkpoint_interval=$def_checkinterval;
 --enable_result_log
 --enable_query_log

mysql-test/suite/maria/t/maria-purge.test

@@ -2,7 +2,7 @@
 -- source include/big_test.inc
 -- source include/not_embedded.inc
 
-# pre-requisites for maria_empty_logs
+# pre-requisites for aria_empty_logs
 connect (admin, localhost, root,,test,,);
 #
 --enable_reconnect
@@ -10,18 +10,18 @@ connection default;
 --enable_reconnect
 # end of pre-requisites
 
-# SHOW ENGINE MARIA LOGS could be influenced by older logs
+# SHOW ENGINE ARIA LOGS could be influenced by older logs
 # Also, possibly automatic checkpoints (see if that happens in
 # practice)
 -- source include/maria_empty_logs.inc
 
 let $default=`select @@global.storage_engine`;
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
-let $def_logsize=`select @@global.maria_log_file_size`;
+let $def_logsize=`select @@global.aria_log_file_size`;
-let $def_checkinterval=`select @@global.maria_checkpoint_interval`;
+let $def_checkinterval=`select @@global.aria_checkpoint_interval`;
 
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 # Initialise
 --disable_warnings
 drop table if exists t1,t2;
@@ -61,58 +61,58 @@ insert into t1 select * from t2;
 insert into t2 select * from t1;
 insert into t1 select * from t2;
 
-set global maria_log_file_size=16777216;
+set global aria_log_file_size=16777216;
 # force a checkpoint to allow log purge
-eval set global maria_checkpoint_interval=$def_checkinterval;
+eval set global aria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
+--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 
 insert into t2 select * from t1;
 insert into t1 select * from t2;
 
-eval set global maria_checkpoint_interval=$def_checkinterval;
+eval set global aria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
+--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
-set global maria_log_file_size=16777216;
+set global aria_log_file_size=16777216;
-select @@global.maria_log_file_size;
+select @@global.aria_log_file_size;
-eval set global maria_checkpoint_interval=$def_checkinterval;
+eval set global aria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
+--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
-set global maria_log_file_size=8388608;
+set global aria_log_file_size=8388608;
-select @@global.maria_log_file_size;
+select @@global.aria_log_file_size;
 
-set global maria_log_purge_type=at_flush;
+set global aria_log_purge_type=at_flush;
 insert into t1 select * from t2;
-eval set global maria_checkpoint_interval=$def_checkinterval;
+eval set global aria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
+--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 flush logs;
---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
+--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 
-set global maria_log_file_size=16777216;
+set global aria_log_file_size=16777216;
-set global maria_log_purge_type=external;
+set global aria_log_purge_type=external;
 insert into t1 select * from t2;
-eval set global maria_checkpoint_interval=$def_checkinterval;
+eval set global aria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
+--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 flush logs;
---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
+--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 
-set global maria_log_purge_type=immediate;
+set global aria_log_purge_type=immediate;
 insert into t1 select * from t2;
-eval set global maria_checkpoint_interval=$def_checkinterval;
+eval set global aria_checkpoint_interval=$def_checkinterval;
---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/
+--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/
-SHOW ENGINE maria logs;
+SHOW ENGINE aria logs;
 
 drop table t1, t2;
 
 --disable_result_log
 --disable_query_log
-set global maria_log_purge_type=immediate;
+set global aria_log_purge_type=immediate;
 eval set global storage_engine=$default;
-eval set global maria_log_file_size=$def_logsize;
+eval set global aria_log_file_size=$def_logsize;
-eval set global maria_checkpoint_interval=$def_checkinterval;
+eval set global aria_checkpoint_interval=$def_checkinterval;
 --enable_result_log
 --enable_query_log

mysql-test/suite/maria/t/maria-recover-master.opt

@@ -1 +1 @@
---loose-maria-recover=backup --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp
+--loose-aria-recover=backup --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp

mysql-test/suite/maria/t/maria-recover.test

@@ -1,4 +1,4 @@
-# Test of the --maria-recover option.
+# Test of the --aria-recover option.
 
 --source include/have_maria.inc
 
@@ -14,13 +14,13 @@ call mtr.add_suppression("Table '\\..mysqltest.t_corrupted2' is marked as crashe
 # so that the perl code below can access it.
 let MYSQLD_DATADIR= `select @@datadir`;
 
-select @@global.maria_recover;
+select @@global.aria_recover;
-set global maria_recover=off;
+set global aria_recover=off;
-select @@global.maria_recover;
+select @@global.aria_recover;
-set global maria_recover=default;
+set global aria_recover=default;
-select @@global.maria_recover;
+select @@global.aria_recover;
-set global maria_recover=normal;
+set global aria_recover=normal;
-select @@global.maria_recover;
+select @@global.aria_recover;
 
 --disable_warnings
 drop database if exists mysqltest;
@@ -29,7 +29,7 @@ create database mysqltest;
 
 use mysqltest;
 
-create table t1 (a varchar(1000), index(a)) engine=maria;
+create table t1 (a varchar(1000), index(a)) engine=aria;
 insert into t1 values("ThursdayMorningsMarket");
 
 flush table t1; # put index page on disk
@@ -45,7 +45,7 @@ copy_file $MYSQLD_DATADIR/mysqltest/t1.MAD $MYSQLD_DATADIR/mysqltest/t_corrupted
 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
+# If aria-block-size is smaller than the default, the corruption
 # messages will differ.
 perl;
     use strict;
@@ -65,4 +65,4 @@ select * from t_corrupted2; # should show corruption and repair messages
 select * from t_corrupted2; # should show just rows
 
 drop database mysqltest;
-set global maria_recover=backup;
+set global aria_recover=backup;

mysql-test/suite/maria/t/maria-recovery-big.test

@@ -1,4 +1,4 @@
-# Maria recovery test which cannot run in shared memory
+# Aria recovery test which cannot run in shared memory
 # because it generates too much data, or which takes a lot of time.
 
 --source include/not_embedded.inc
@@ -9,7 +9,7 @@
 --source include/have_maria.inc
 --source include/big_test.inc
 
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 
 --disable_warnings
 drop database if exists mysqltest;
@@ -33,7 +33,7 @@ use mysqltest;
 
 --echo * TEST of recovery with blobs
 -- source include/maria_empty_logs.inc
-create table t1 (a int, b longtext) engine=maria table_checksum=1;
+create table t1 (a int, b longtext) engine=aria table_checksum=1;
 let $mms_tables=1;
 -- source include/maria_make_snapshot_for_feeding_recovery.inc
 insert into t1 values (1,"123456789012345678901234567890"),(2,"09876543210987654321");
@@ -57,7 +57,7 @@ select a,length(b) from t1;
 let $mvr_restore_old_snapshot=1;
 let $mms_compare_physically=0;
 let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 -- source include/maria_verify_recovery.inc
 drop table t1;
 

mysql-test/suite/maria/t/maria-recovery-bitmap.test

@@ -1,4 +1,4 @@
-# Tests of Maria's recovery of the bitmap pages
+# Tests of Aria's recovery of the bitmap pages
 
 --source include/not_embedded.inc
 # Don't test this under valgrind, memory leaks will occur as we crash
@@ -25,14 +25,14 @@ use mysqltest;
 
 -- source include/maria_empty_logs.inc
 let $mms_tables=1;
-create table t1 (a varchar(10000)) engine=maria;
+create table t1 (a varchar(10000)) engine=aria;
 
 # we want recovery to use the tables as they were at time of crash
 let $mvr_restore_old_snapshot=0;
 # UNDO phase prevents physical comparison, normally,
 # so we'll only use checksums to compare.
 let $mms_compare_physically=0;
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 
 --echo * TEST of over-allocated bitmap not flushed by checkpoint
 let $mvr_debug_option="+d,maria_crash";
@@ -45,7 +45,7 @@ insert into t1 values ("bbbbbbb");
 insert into t1 values ("bbbbbbb");
 delete from t1 limit 1;
 # Use a separate connection here. The reason is that we leave a dangling
-# --send on the connection during maria_verify_recovery.inc, which makes that
+# --send on the connection during aria_verify_recovery.inc, which makes that
 # script fail if it were to try to use that connection before --reap.
 connect (extra, localhost, root,,mysqltest,,);
 set session debug="+d,info,enter,exit,maria_over_alloc_bitmap";
@@ -59,7 +59,7 @@ sleep 5;
 # bitmap page; as REDO-UNDO was not written, bitmap and data page
 # would be inconsistent. Correct checkpoint will wait until UNDO is
 # written.
-set global maria_checkpoint_interval=1;
+set global aria_checkpoint_interval=1;
 -- source include/maria_verify_recovery.inc
 connection default;
 

mysql-test/suite/maria/t/maria-recovery-master.opt

@@ -1 +1 @@
---skip-stack-trace --skip-core-file --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp
+--skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp

mysql-test/suite/maria/t/maria-recovery-rtree-ft.test

@@ -7,7 +7,7 @@
 --source include/have_debug.inc
 --source include/have_maria.inc
 
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 let $MARIA_LOG=.;
 
 --disable_warnings
@@ -34,10 +34,10 @@ CREATE TABLE t1 (
   kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po',
   name VARCHAR(32)
   ,SPATIAL key (line)
-) transactional=1 row_format=page engine=maria;
+) transactional=1 row_format=page engine=aria;
 SHOW INDEX FROM t1;
 CREATE TABLE t2 (a VARCHAR(200), b TEXT, FULLTEXT (a,b)
-) transactional=1 row_format=page engine=maria;
+) transactional=1 row_format=page engine=aria;
 SHOW INDEX FROM t2;
 
 let $query1=   INSERT INTO t1 (name, kind, line) VALUES 
@@ -113,7 +113,7 @@ while($1)
 let $mvr_restore_old_snapshot=1;
 let $mms_compare_physically=0;
 let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 # the script below will trigger recovery and compare checksums
 -- source include/maria_verify_recovery.inc
 
@@ -132,7 +132,7 @@ let $mvr_restore_old_snapshot=0;
 # UNDO phase prevents physical comparison, normally,
 # so we'll only use checksums to compare.
 let $mms_compare_physically=0;
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 
 # Note that we don't remove logs between iterations. Test is
 # cumulative (each new recovery processes more log records than the previous).

mysql-test/suite/maria/t/maria-recovery.test

@@ -5,7 +5,7 @@
 --source include/have_debug.inc
 --source include/have_maria.inc
 
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 let $MARIA_LOG=../../tmp;
 
 --disable_warnings
@@ -27,7 +27,7 @@ use mysqltest;
 # A sample test
 -- source include/maria_empty_logs.inc
 let $mms_tables=1;
-create table t1 (a varchar(1000)) engine=maria;
+create table t1 (a varchar(1000)) engine=aria;
 
 --echo * TEST of REDO: see if recovery can reconstruct if we give it an old table
 
@@ -42,7 +42,7 @@ let $mvr_restore_old_snapshot=1;
 # produce a physically identical table.
 let $mms_compare_physically=1;
 let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 # the script below will trigger recovery and compare checksums
 -- source include/maria_verify_recovery.inc
 let $mms_compare_physically=0;
@@ -63,7 +63,7 @@ let $mvr_restore_old_snapshot=0;
 # UNDO phase prevents physical comparison, normally,
 # so we'll only use checksums to compare.
 let $mms_compare_physically=0;
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 
 # Note that we don't remove logs between iterations. Test is
 # cumulative (each new recovery processes more log records than the previous).
@@ -131,7 +131,7 @@ CREATE TABLE t1 (
   i int,
   b blob default NULL,
   c varchar(6000) default NULL
-) ENGINE=MARIA CHECKSUM=1;
+) ENGINE=ARIA CHECKSUM=1;
 -- source include/maria_make_snapshot_for_feeding_recovery.inc
 INSERT INTO t1 VALUES (1, REPEAT('a', 5000), REPEAT('b', 5000));
 UPDATE t1 SET i=3, b=CONCAT(b,'c') WHERE i=1;
@@ -141,7 +141,7 @@ SELECT LENGTH(b) FROM t1 WHERE i=3;
 let $mvr_restore_old_snapshot=1;
 let $mms_compare_physically=0;
 let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 -- source include/maria_verify_recovery.inc
 SELECT LENGTH(b) FROM t1 WHERE i=3;
 drop table t1;
@@ -154,7 +154,7 @@ CREATE TABLE t1 (
   i int auto_increment primary key,
   c varchar(6),
   key(c)
-) ENGINE=MARIA;
+) ENGINE=ARIA;
 insert into t1 values(null,"b");
 -- source include/maria_make_snapshot_for_feeding_recovery.inc
 insert into t1 values(null,"a"), (null,"c"), (null,"d");
@@ -164,7 +164,7 @@ delete from t1 where c="d";
 let $mvr_restore_old_snapshot=1;
 let $mms_compare_physically=0;
 let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 -- source include/maria_verify_recovery.inc
 show create table t1;
 
@@ -176,7 +176,7 @@ update t1 set i=15 where c="a";
 let $mvr_restore_old_snapshot=1;
 let $mms_compare_physically=0;
 let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 -- source include/maria_verify_recovery.inc
 show create table t1;
 
@@ -187,7 +187,7 @@ show create table t1;
 let $mvr_restore_old_snapshot=0;
 let $mms_compare_physically=0;
 let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 lock tables t1 write;
 insert into t1 values(null, "e");
 -- source include/maria_verify_recovery.inc

mysql-test/suite/maria/t/maria-recovery2-master.opt

@@ -1 +1 @@
---skip-stack-trace --skip-core-file --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp --myisam-recover=
+--skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp --myisam-recover=

mysql-test/suite/maria/t/maria-recovery2.test

@@ -5,10 +5,10 @@
 --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("File '.*aria_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");
+call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with aria_chk -r");
 
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 let $MARIA_LOG=../../tmp;
 
 --disable_warnings
@@ -31,13 +31,13 @@ let $mms_tables=1;
 let $mvr_restore_old_snapshot=0;
 let $mms_compare_physically=0;
 let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 
 # Test of removing logs manually
 --echo * TEST of removing logs manually
 let $mel_keep_control_file=1;
 # this will shut mysqld down cleanly (so, take a checkpoint) and
-# remove only logs; at restart Maria will create a new log with a high
+# remove only logs; at restart Aria will create a new log with a high
 # number
 -- source include/maria_empty_logs.inc
 let $mel_keep_control_file=0;
@@ -49,8 +49,8 @@ let $mvr_restore_old_snapshot=0;
 # UNDO phase prevents physical comparison, normally,
 # so we'll only use checksums to compare.
 let $mms_compare_physically=0;
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
-create table t1(a int) engine=maria;
+create table t1(a int) engine=aria;
 insert into t1 values(1),(2);
 -- source include/maria_make_snapshot_for_comparison.inc
 lock tables t1 write;
@@ -64,8 +64,8 @@ drop table t1;
 # Don't take a full checkpoints, we want to test checkpoint vs dirty pages
 set global debug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect";
 # restart checkpoint thread for it to notice the above
-set global maria_checkpoint_interval=10000;
+set global aria_checkpoint_interval=10000;
-create table t1(a int, b varchar(10), index(a,b)) engine=maria;
+create table t1(a int, b varchar(10), index(a,b)) engine=aria;
 insert into t1 values(1,"a"),(2,"b"),(3,"c");
 delete from t1 where b="b";
 update t1 set b="d" where a=1;
@@ -74,15 +74,15 @@ lock tables t1 write;
 insert into t1 values(4,"e"),(5,"f"),(6,"g");
 update t1 set b="h" where a=5;
 delete from t1 where b="g";
-show status like "Maria_pagecache_blocks_not_flushed";
+show status like "Aria_pagecache_blocks_not_flushed";
 # force a checkpoint; there should be dirty pages and an open transaction
-set global maria_checkpoint_interval=10000;
+set global aria_checkpoint_interval=10000;
 # do some more work
 update t1 set b="i" where a=5;
 let $mvr_restore_old_snapshot=0;
 let $mms_compare_physically=0;
 let $mvr_debug_option="+d,maria_crash";
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 # Now we have a recovery, which should use the checkpoint record
 # and its dirty pages list.
 -- source include/maria_verify_recovery.inc
@@ -90,10 +90,10 @@ drop table t1;
 
 --echo Test of REPAIR's implicit commit
 let $mms_tables=1;
-create table t1 (a varchar(100), key(a)) engine=maria;
+create table t1 (a varchar(100), key(a)) engine=aria;
 let $mvr_restore_old_snapshot=0;
 let $mms_compare_physically=0;
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 
 let $mvr_debug_option="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
 insert into t1 values(3);
@@ -111,11 +111,11 @@ select * from t1;
 drop table t1;
 
 --echo * TEST of recovery when crash before bulk-insert-with-repair is committed
-create table t1 (a varchar(100), key(a)) engine=maria;
+create table t1 (a varchar(100), key(a)) engine=aria;
 create table t2 (a varchar(100)) engine=myisam;
 let $mvr_restore_old_snapshot=0;
 let $mms_compare_physically=0;
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 let $mvr_debug_option="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
 set rand_seed1=12, rand_seed2=254; # repeatable
 insert into t2 values (rand());
@@ -136,7 +136,7 @@ show keys from t1; # should be enabled
 drop table t1;
 
 --echo * TEST of recovery when OPTIMIZE has replaced the index file and crash
-create table t_corrupted1 (a varchar(100), key(a)) engine=maria;
+create table t_corrupted1 (a varchar(100), key(a)) engine=aria;
 # we use a special name because this test portion will generate
 # corruption warnings, which we tell mtr_report.pl to ignore by
 # putting the message in mtr_report.pl, but we don't want to it ignore

mysql-test/suite/maria/t/maria-recovery3-master.opt

@@ -1 +1 @@
---skip-stack-trace --skip-core-file --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp
+--skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp

mysql-test/suite/maria/t/maria-recovery3.test

@@ -5,7 +5,7 @@
 --source include/have_debug.inc
 --source include/have_maria.inc
 
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 let $MARIA_LOG=../../tmp;
 
 --disable_warnings
@@ -28,7 +28,7 @@ let $mms_tables=1;
 let $mvr_restore_old_snapshot=0;
 let $mms_compare_physically=0;
 let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
-let $mvr_crash_statement= set global maria_checkpoint_interval=1;
+let $mvr_crash_statement= set global aria_checkpoint_interval=1;
 
 -- source include/maria_empty_logs.inc
 
@@ -39,7 +39,7 @@ let $mvr_restore_old_snapshot=0;
 # UNDO phase prevents physical comparison, normally,
 # so we'll only use checksums to compare.
 let $mms_compare_physically=0;
-create table t1(a int primary key) engine=maria;
+create table t1(a int primary key) engine=aria;
 insert into t1 values(1);
 -- source include/maria_make_snapshot_for_comparison.inc
 set session debug="+d,maria_sleep_in_commit";
@@ -49,7 +49,7 @@ sleep 1;
 # but not yet called trnman_commit(), so for checkpoint it's not
 # committed.
 connection admin;
-set global maria_checkpoint_interval=1000; # force a checkpoint
+set global aria_checkpoint_interval=1000; # force a checkpoint
 connection default;
 reap; # end of INSERT
 delete from t1 where a=2;
@@ -64,17 +64,17 @@ drop table t1;
 # before checkpoint happens, test should still pass (though it won't
 # reproduce the conditions of the bug).
 
-# Test for BUG#41493 Maria: two recovery failures (wrong logging of BLOB pages)
+# Test for BUG#41493 Aria: two recovery failures (wrong logging of BLOB pages)
 --echo * TEST of logging of BLOBs
 let $mvr_restore_old_snapshot=1;
 let $mms_compare_physically=1;
 CREATE TABLE `t1` (
 `blob` blob,
 `blob_key` blob
-) ENGINE=maria ROW_FORMAT=page
+) ENGINE=aria ROW_FORMAT=page
 ;
 -- source include/maria_make_snapshot_for_feeding_recovery.inc
-set global maria_checkpoint_interval=0; # no checkpoints
+set global aria_checkpoint_interval=0; # no checkpoints
 INSERT INTO `t1` VALUES (NULL,repeat('A',5198));
 INSERT INTO `t1` VALUES (NULL,repeat('B',65535));
 INSERT INTO `t1` VALUES (repeat('K',5198),repeat('L',2325));
@@ -88,14 +88,14 @@ check table t1 extended;
 -- source include/maria_verify_recovery.inc
 drop table t1;
 
-# Test for BUG#42112 "Maria: recovery failure (pushbuild2) Assertion
+# Test for BUG#42112 "Aria: recovery failure (pushbuild2) Assertion
 # `rownr == 0 && new_page' failed"
 
 let $mvr_restore_old_snapshot=0;
 let $mms_compare_physically=0;
-create table t1 engine=maria select 1;
+create table t1 engine=aria select 1;
 -- source include/maria_make_snapshot_for_feeding_recovery.inc
-set global maria_checkpoint_interval=0; # no checkpoints
+set global aria_checkpoint_interval=0; # no checkpoints
 insert into t1 values(2);
 truncate table t1;
 -- source include/maria_make_snapshot_for_comparison.inc

mysql-test/suite/maria/t/maria.test

@@ -1,20 +1,20 @@
 #
-# Testing of potential problems in Maria
+# Testing of potential problems in Aria
 # This code was initially taken from myisam.test
 #
 
 -- source include/have_maria.inc
 -- source include/have_partition.inc
 
-select * from INFORMATION_SCHEMA.ENGINES where ENGINE="MARIA";
+select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA";
 
 let $default_engine=`select @@global.storage_engine`;
-let $default_checksum=`select @@global.maria_page_checksum`;
+let $default_checksum=`select @@global.aria_page_checksum`;
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
-set global maria_page_checksum=0;
+set global aria_page_checksum=0;
-let $default_log_file_size=`select @@global.maria_log_file_size`;
+let $default_log_file_size=`select @@global.aria_log_file_size`;
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 
 # Initialise
 --disable_warnings
@@ -116,7 +116,7 @@ DROP TABLE t1;
 
 #
 # Test of optimize, when only mi_sort_index (but not mi_repair*) is done
-# in ha_maria::repair, and index size is changed (decreased).
+# in ha_aria::repair, and index size is changed (decreased).
 #
 
 create table t1 ( t1 char(255), key(t1(250)));
@@ -154,7 +154,7 @@ check table t1;
 drop table t1;
 
 #
-# test of maria with huge number of packed fields
+# test of aria with huge number of packed fields
 #
 
 create table t1 (i1 int, i2 int, i3 int, i4 int, i5 int, i6 int, i7 int, i8
@@ -533,7 +533,7 @@ drop table t1;
 
 #
 # Test join that could miss concurrently inserted row
-# Note that for the moment Maria only supports multiple writers if we have
+# Note that for the moment Aria only supports multiple writers if we have
 # static or dynamic row format
 #
 # Partial key.
@@ -664,10 +664,10 @@ checksum table t1;
 drop table t1;
 
 #
-# maria_stats_method variable.
+# aria_stats_method variable.
 #
 
-show variables like 'maria_stats_method';
+show variables like 'aria_stats_method';
 
 create table t1 (a int, key(a));
 insert into t1 values (0),(1),(2),(3),(4);
@@ -682,8 +682,8 @@ check table t1;
 show index from t1;
 
 # Set nulls to be equal:
-set maria_stats_method=nulls_equal;
+set aria_stats_method=nulls_equal;
-show variables like 'maria_stats_method';
+show variables like 'aria_stats_method';
 insert into t1 values (11);
 delete from t1 where a=11;
 
@@ -697,8 +697,8 @@ check table t1;
 show index from t1;
 
 # Set nulls back to be equal 
-set maria_stats_method=DEFAULT;
+set aria_stats_method=DEFAULT;
-show variables like 'maria_stats_method';
+show variables like 'aria_stats_method';
 insert into t1 values (11);
 delete from t1 where a=11;
 
@@ -713,9 +713,9 @@ show index from t1;
 
 drop table t1;
 
-# WL#2609, CSC#XXXX: MARIA 
+# WL#2609, CSC#XXXX: ARIA 
-set maria_stats_method=nulls_ignored;
+set aria_stats_method=nulls_ignored;
-show variables like 'maria_stats_method';
+show variables like 'aria_stats_method';
 
 create table t1 (
   a char(3), b char(4), c char(5), d char(6),
@@ -735,7 +735,7 @@ delete from t1;
 analyze table t1;
 show index from t1;
 
-set maria_stats_method=DEFAULT;
+set aria_stats_method=DEFAULT;
 
 drop table t1;
 
@@ -768,7 +768,7 @@ create table t1 (
   t text not null,
   primary key  (id1),
   key x (id2, t(32))
-) engine=maria; # engine clause is redundant but it's to test its parsing
+) engine=aria; # engine clause is redundant but it's to test its parsing
 insert into t1 (id2, t) values
 (10, 'abc'), (10, 'abc'), (10, 'abc'),
 (20, 'abc'), (20, 'abc'), (20, 'def'),
@@ -801,8 +801,8 @@ DROP TABLE t1;
 #
 # OPTIMIZE TABLE with multiple threads
 #
-SET @@maria_repair_threads=2;
+SET @@aria_repair_threads=2;
-SHOW VARIABLES LIKE 'maria_repair%';
+SHOW VARIABLES LIKE 'aria_repair%';
 #
 # Test OPTIMIZE. This creates a new data file.
 CREATE TABLE t1 (
@@ -888,8 +888,8 @@ SHOW TABLE STATUS LIKE 't1';
 SELECT _id FROM t1;
 DROP TABLE t1;
 #
-SET @@maria_repair_threads=1;
+SET @@aria_repair_threads=1;
-SHOW VARIABLES LIKE 'maria_repair%';
+SHOW VARIABLES LIKE 'aria_repair%';
 
 #
 # Test varchar
@@ -910,7 +910,7 @@ create table t1 (v varchar(65530) character set utf8);
 show create table t1;
 drop table t1;
 
-# MARIA specific varchar tests
+# ARIA specific varchar tests
 --error 1118
 create table t1 (v varchar(65535));
 
@@ -1040,7 +1040,7 @@ create table t4 (c1 int) pack_keys=2;
 drop table t1, t2, t3;
 
 #
-# Bug#28476: force index on a disabled maria index gives error 124
+# Bug#28476: force index on a disabled aria index gives error 124
 #
 
 CREATE TABLE t1(a INT, b INT, KEY inx (a), UNIQUE KEY uinx (b));
@@ -1078,13 +1078,13 @@ ALTER TABLE t1 ENABLE KEYS;
 --replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 #
 SHOW TABLE STATUS LIKE 't1';
 #--exec ls -log var/mysqld.1/data/test/t1
-#--exec maria_chk -dvv var/mysqld.1/data/test/t1
+#--exec aria_chk -dvv var/mysqld.1/data/test/t1
-#--exec maria_chk -iev var/mysqld.1/data/test/t1
+#--exec aria_chk -iev var/mysqld.1/data/test/t1
 --echo # Enable keys with parallel repair
-SET @@maria_repair_threads=2;
+SET @@aria_repair_threads=2;
 ALTER TABLE t1 DISABLE KEYS;
 ALTER TABLE t1 ENABLE KEYS;
-SET @@maria_repair_threads=1;
+SET @@aria_repair_threads=1;
 CHECK TABLE t1 EXTENDED;
 DROP TABLE t1;
 
@@ -1108,7 +1108,7 @@ DROP TABLE t1, t2;
 #
 # Bug#37310: 'on update CURRENT_TIMESTAMP' option crashes the table
 #
-CREATE TABLE t1 (a INT) ENGINE=MARIA CHECKSUM=1 ROW_FORMAT=DYNAMIC;
+CREATE TABLE t1 (a INT) ENGINE=ARIA CHECKSUM=1 ROW_FORMAT=DYNAMIC;
 INSERT INTO t1 VALUES (0);
 UPDATE t1 SET a=1;
 SELECT a FROM t1;
@@ -1237,7 +1237,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
   c1 CHAR(130),
   c2 VARCHAR(1)
-) ENGINE=maria;
+) ENGINE=aria;
 INSERT INTO t1 VALUES(REPEAT("a",128), 'b');
 SELECT COUNT(*) FROM t1;
 CHECK TABLE t1;
@@ -1252,7 +1252,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
   c1 CHAR(130),
   c2 VARCHAR(1)
-) ENGINE=maria;
+) ENGINE=aria;
 INSERT INTO t1 VALUES(REPEAT("a",128), 'b');
 SELECT COUNT(*) FROM t1;
 CHECK TABLE t1 EXTENDED;
@@ -1267,7 +1267,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
   c1 CHAR(130),
   c2 VARCHAR(1)
-) ENGINE=maria;
+) ENGINE=aria;
 INSERT INTO t1 VALUES(REPEAT("a",128), 'b');
 # Insert more rows and delete one in the middle to force optimize.
 INSERT INTO t1 VALUES('b', 'b');
@@ -1286,7 +1286,7 @@ CREATE TABLE t1 (
   c1 CHAR(130),
   c2 VARCHAR(1),
   KEY (c1)
-) ENGINE=maria;
+) ENGINE=aria;
 #
 # Insert 100 rows. This turns bulk insert on during the copy phase of
 # ALTER TABLE. Bulk insert disables keys before the insert and re-enables
@@ -1304,7 +1304,7 @@ while ($count)
 # Change most of the rows into long character values with > 127 characters.
 UPDATE t1 SET c1=REPEAT("a",128) LIMIT 90;
 SELECT COUNT(*) FROM t1;
-ALTER TABLE t1 ENGINE=maria;
+ALTER TABLE t1 ENGINE=aria;
 #
 # With bug present, this shows that all long rows are gone.
 SELECT COUNT(*) FROM t1;
@@ -1318,7 +1318,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
   c1 CHAR(50),
   c2 VARCHAR(1)
-) ENGINE=maria DEFAULT CHARSET UTF8;
+) ENGINE=aria DEFAULT CHARSET UTF8;
 # Using Tamil Letter A, Unicode U+0B85
 INSERT INTO t1 VALUES(REPEAT(_utf8 x'e0ae85',43), 'b');
 SELECT COUNT(*) FROM t1;
@@ -1334,7 +1334,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
   c1 CHAR(50),
   c2 VARCHAR(1)
-) ENGINE=maria DEFAULT CHARSET UTF8;
+) ENGINE=aria DEFAULT CHARSET UTF8;
 # Using Tamil Letter A, Unicode U+0B85
 INSERT INTO t1 VALUES(REPEAT(_utf8 x'e0ae85',43), 'b');
 SELECT COUNT(*) FROM t1;
@@ -1350,7 +1350,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
   c1 CHAR(50),
   c2 VARCHAR(1)
-) ENGINE=maria DEFAULT CHARSET UTF8;
+) ENGINE=aria DEFAULT CHARSET UTF8;
 # Using Tamil Letter A, Unicode U+0B85
 INSERT INTO t1 VALUES(REPEAT(_utf8 x'e0ae85',43), 'b');
 # Insert more rows and delete one in the middle to force optimize.
@@ -1370,7 +1370,7 @@ CREATE TABLE t1 (
   c1 CHAR(50),
   c2 VARCHAR(1),
   KEY (c1)
-) ENGINE=maria DEFAULT CHARSET UTF8;
+) ENGINE=aria DEFAULT CHARSET UTF8;
 #
 # Insert 100 rows. This turns bulk insert on during the copy phase of
 # ALTER TABLE. Bulk insert disables keys before the insert and re-enables
@@ -1389,7 +1389,7 @@ while ($count)
 # Using Tamil Letter A, Unicode U+0B85
 UPDATE t1 SET c1=REPEAT(_utf8 x'e0ae85',43) LIMIT 90;
 SELECT COUNT(*) FROM t1;
-ALTER TABLE t1 ENGINE=maria;
+ALTER TABLE t1 ENGINE=aria;
 #
 # With bug present, this shows that all long rows are gone.
 SELECT COUNT(*) FROM t1;
@@ -1406,7 +1406,7 @@ CREATE TABLE t1 (
   c3 VARCHAR(10) NOT NULL,
   KEY (c1),
   KEY (c2)
-) ENGINE=maria DEFAULT CHARSET=utf8 PACK_KEYS=0;
+) ENGINE=aria DEFAULT CHARSET=utf8 PACK_KEYS=0;
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 --exec $MARIA_CHK -d $MYSQLD_DATADIR/test/t1
@@ -1423,10 +1423,10 @@ drop table t1;
 # (same content / differen checksum)
 #
 
-CREATE TABLE t1 (line LINESTRING NOT NULL) engine=maria;
+CREATE TABLE t1 (line LINESTRING NOT NULL) engine=aria;
 INSERT INTO t1 VALUES (GeomFromText("POINT(0 0)"));
 checksum table t1;
-CREATE TABLE t2 (line LINESTRING NOT NULL) engine=maria;
+CREATE TABLE t2 (line LINESTRING NOT NULL) engine=aria;
 INSERT INTO t2 VALUES (GeomFromText("POINT(0 0)"));
 checksum table t2;
 CREATE TABLE t3 select * from t1;
@@ -1437,7 +1437,7 @@ drop table t1,t2,t3;
 #
 # from bug37276_reduced_corruption.sql
 #
-create table t2(a varchar(255),key(a))engine=maria row_format=dynamic transactional=0;
+create table t2(a varchar(255),key(a))engine=aria row_format=dynamic transactional=0;
 insert into t2 values (repeat('o',124)), (repeat('h',226)), (repeat('i',236)),
 (repeat('l',234)), (repeat('b',13)), (repeat('g',236)), (repeat('y',205)),
 (repeat('c',99)), (repeat('g',145)), (repeat('o',131)), (repeat('e',63)),
@@ -1649,7 +1649,7 @@ col172 tinyint(1) DEFAULT NULL,
 col173 tinytext,
 col174 decimal(10,0) DEFAULT NULL,
 col175 double DEFAULT NULL
-) engine=maria;
+) engine=aria;
 
 insert ignore into t1 set 
 col10=abs(28449) % 2,
@@ -1766,10 +1766,10 @@ check table t1;
 drop table t1;
 
 #
-# Bug#38466 maria: range query returns no data
+# Bug#38466 aria: range query returns no data
 #
 
-create table t1 (a char(200) primary key, b int default 12345) engine=maria;
+create table t1 (a char(200) primary key, b int default 12345) engine=aria;
 insert t1 (a) values (repeat('0', 200));
 insert t1 (a) values (repeat('1', 200)), (repeat('2', 200)), (repeat('3', 200)),
  (repeat('4', 200)), (repeat('5', 200)), (repeat('6', 200)), (repeat('7', 200)),
@@ -1787,7 +1787,7 @@ drop table t1;
 #
 # BUG#38606  test suite
 #
-create table t1 (a int) engine=maria transactional=1;
+create table t1 (a int) engine=aria transactional=1;
 insert into t1 values (1);
 lock table t1 write concurrent;
 # should be fixed with fully implemented versioning
@@ -1801,7 +1801,7 @@ drop table t1;
 #
 
 create table t1 (p int primary key, i int, a char(10), key k1(i), key k2(a))
-engine maria;
+engine aria;
 insert into t1 values (1, 1, 'qqqq'), (2, 1, 'pppp'),
                       (3, 1, 'yyyy'), (4, 3, 'zzzz');
 insert into t1 values (5, 3, 'yyyy'), (6, 3, 'yyyy'), (7, 0, NULL),
@@ -1819,8 +1819,8 @@ drop table t1;
 # --mysqld=--binlog-format=row --ps-protocol
 #
 
-create table t1 (f1 int unique, f2 int) engine=maria;
+create table t1 (f1 int unique, f2 int) engine=aria;
-create table t2 (f3 int, f4 int) engine=maria;
+create table t2 (f3 int, f4 int) engine=aria;
 create view v1 as select * from t1, t2 where f1= f3;
 insert into t1 values (1,11), (2,22);
 --error 1393
@@ -1834,7 +1834,7 @@ drop view v1;
 # BUG#39399 ALTER TABLE renaming column: affected_rows > 0
 #
 
-CREATE TABLE t1 (id int, c varchar(10)) engine=maria;
+CREATE TABLE t1 (id int, c varchar(10)) engine=aria;
 INSERT INTO t1 VALUES (1,"1");
 --enable_info
 ALTER TABLE t1 CHANGE c d varchar(10);
@@ -1842,7 +1842,7 @@ ALTER TABLE t1 CHANGE c d varchar(10);
 drop table t1;
 
 #
-# Bug #39227 Maria: crash with ALTER TABLE PARTITION
+# Bug #39227 Aria: crash with ALTER TABLE PARTITION
 #
 
 create table t1 (s1 int);
@@ -1852,7 +1852,7 @@ alter table t1 partition by list (s1) (partition p1 values in (2));
 drop table t1;
 
 #
-# Bug #39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TABLES
+# Bug #39226 Aria: crash with FLUSH TABLES WITH READ LOCK after LOCK TABLES
 
 create table t1 (c1 int);
 create table t2 (c1 int);
@@ -1866,7 +1866,7 @@ drop table t1, t2;
 # Crash when aborting inserting of row with 2 blobs where first is short
 #
 
-create table t1(a int primary key, b blob, c blob) engine=maria;
+create table t1(a int primary key, b blob, c blob) engine=aria;
 insert into t1 values(1,repeat('a',100), repeat('b',657860));
 --error ER_DUP_ENTRY
 insert into t1 values(1,repeat('a',100), repeat('b',657860));
@@ -1917,7 +1917,7 @@ drop table t1;
 --disable_result_log
 --disable_query_log
 eval set global storage_engine=$default_engine,
-maria_page_checksum=$default_checksum,
+aria_page_checksum=$default_checksum,
-maria_log_file_size=$default_log_file_size;
+aria_log_file_size=$default_log_file_size;
 --enable_result_log
 --enable_query_log

mysql-test/suite/maria/t/maria2.test

@@ -6,13 +6,13 @@ drop table if exists t1,t2;
 --enable_warnings
 
 # Test for BUG#36319
-# "Maria: table is not empty but DELETE and SELECT find no rows"
+# "Aria: table is not empty but DELETE and SELECT find no rows"
 
 CREATE TABLE t1 (
   line BLOB,
   kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po',
   name VARCHAR(32)
-) transactional=0 row_format=page engine=maria;
+) transactional=0 row_format=page engine=aria;
 
 let $query=   INSERT INTO t1 (name, kind, line) VALUES 
   ("Aadaouane", "pp", GeomFromText("POINT(32.816667 35.983333)")),
@@ -74,8 +74,8 @@ drop table t1;
 # Testing of ALTER TABLE under lock tables
 #
 
-create table t1 (i int) engine=maria;
+create table t1 (i int) engine=aria;
-create table t2 (j int) engine=maria;
+create table t2 (j int) engine=aria;
 lock table t1 write, t2 read;
 alter table t1 modify i int default 1;
 insert into t1 values (2);
@@ -89,7 +89,7 @@ drop table t1,t2;
 # test INSERT ON DUPLICATE KEY UPDATE
 #
 
-create table t1(id int, s char(1), unique(s)) engine=maria;
+create table t1(id int, s char(1), unique(s)) engine=aria;
 insert into t1 values(1,"a") on duplicate key update t1.id=t1.id+1;
 insert into t1 values(1,"a") on duplicate key update t1.id=t1.id+1;
 insert into t1 select 1,"a" on duplicate key update t1.id=t1.id+1;
@@ -101,7 +101,7 @@ select * from t1;
 drop table t1;
 
 # test LOAD DATA INFILE REPLACE
-create table t1 (pk int primary key, apk int unique, data int) engine=maria;
+create table t1 (pk int primary key, apk int unique, data int) engine=aria;
 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);
 select * from t1 order by pk;

mysql-test/suite/maria/t/maria3.test

@@ -1,14 +1,14 @@
 -- source include/have_maria.inc
 
-select * from INFORMATION_SCHEMA.ENGINES where ENGINE="MARIA";
+select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA";
 
 let $default_engine=`select @@global.storage_engine`;
-let $default_checksum=`select @@global.maria_page_checksum`;
+let $default_checksum=`select @@global.aria_page_checksum`;
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
-set global maria_page_checksum=0;
+set global aria_page_checksum=0;
-let $default_log_file_size=`select @@global.maria_log_file_size`;
+let $default_log_file_size=`select @@global.aria_log_file_size`;
-set global maria_log_file_size=4294967295;
+set global aria_log_file_size=4294967295;
 
 # Initialise
 --disable_warnings
@@ -142,7 +142,7 @@ create table `t1` (
     t1_id int(10) unsigned not null auto_increment,
     key (t1_name),
     primary key (t1_id)
-) engine=maria auto_increment = 1000 default charset=latin1;
+) engine=aria auto_increment = 1000 default charset=latin1;
 lock tables t1 write;
 INSERT INTO `t1` VALUES ('bla',1000),('bla',1001),('bla',1002);
 check table t1;
@@ -188,7 +188,7 @@ drop table t1;
 # Test where we shrink varchar
 #
 
-CREATE TABLE t1 (a int, b int, v varchar(60000)) checksum=1 engine=maria;
+CREATE TABLE t1 (a int, b int, v varchar(60000)) checksum=1 engine=aria;
 insert into t1 values (1,1,"aaa"),(1,2,null);
 checksum table t1;
 lock table t1 write;
@@ -239,13 +239,13 @@ CREATE TABLE t1 (
   KEY (ulong),
   KEY (ulonglong,ulong),
   KEY (options,flags)
-) engine=maria;
+) engine=aria;
 insert into t1 values (10,1,1,1,1,1,1,1,1,1,1,1,1,1,NULL,0,0,0,1,1,1,1,'one','one');
-create table t2 (primary key (auto)) engine=maria row_format=page select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
+create table t2 (primary key (auto)) engine=aria row_format=page select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
 check table t1,t2;
 select t1,t2,length(t3),length(t4),length(t5),length(t6),t7,t8 from t2;
 drop table t2;
-create table t2 (primary key (auto)) engine=maria row_format=dynamic select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
+create table t2 (primary key (auto)) engine=aria row_format=dynamic select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
 check table t2;
 drop table t1,t2;
 
@@ -259,9 +259,9 @@ drop table t1;
 
 # Fix if we are using safemalloc
 --replace_result 8388572 8388600
-select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "maria%" and variable_name not like "maria_used_for_temp_tables" order by 1;
+select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "aria%" and variable_name not like "aria_used_for_temp_tables" order by 1;
 --replace_column 2 #
-show status like 'maria%';
+show status like 'aria%';
 
 #
 # Test creating table with no field data and index on zero length columns
@@ -300,7 +300,7 @@ drop table t1;
 #
 # Show that page_checksum is remembered
 #
-set global maria_page_checksum=1;
+set global aria_page_checksum=1;
 create table t1 (a int);
 show create table t1;
 drop table t1;
@@ -310,7 +310,7 @@ drop table t1;
 #
 
 --enable_warnings
-set global maria_log_file_size=4294967296;
+set global aria_log_file_size=4294967296;
 
 #
 # Test delete of all rows in autocommit and not autocommit
@@ -338,10 +338,10 @@ create table t3 select * from t1, t2; # Should give an error
 create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1, t2;
 drop table t1, t2, t3;
 
-# Test for bug "maria_repair() (OPTIMIZE) leaves wrong
+# Test for bug "aria_repair() (OPTIMIZE) leaves wrong
 # data_file_length" (originally from type_datetime.test)
 
-create table t1 (t datetime) engine=maria;
+create table t1 (t datetime) engine=aria;
 insert into t1 values (101),(691231),(700101),(991231),(10000101),(99991231),(101000000),(691231000000),(700101000000),(991231235959),(10000101000000),(99991231235959),(20030100000000),(20030000000000);
 select * from t1;
 optimize table t1;
@@ -394,18 +394,18 @@ drop table t1;
 # Test warnings with transactional=1 with MyISAM
 #
 
-create table t1 (n int not null, c char(1)) engine=maria;
+create table t1 (n int not null, c char(1)) engine=aria;
 alter table t1 engine=myisam;
-alter table t1 engine=maria;
+alter table t1 engine=aria;
 show create table t1;
 drop table t1;
-create table t1 (n int not null, c char(1)) engine=maria transactional=1;
+create table t1 (n int not null, c char(1)) engine=aria transactional=1;
 alter table t1 engine=myisam;
-alter table t1 engine=maria;
+alter table t1 engine=aria;
 show create table t1;
 drop table t1;
 create table t1 (n int not null, c char(1)) engine=myisam transactional=1;
-alter table t1 engine=maria;
+alter table t1 engine=aria;
 show create table t1;
 drop table t1;
 
@@ -453,7 +453,7 @@ drop table t1, t2;
 
 #
 # Test problems with small rows and row_type=page 
-# Bug 35048 "maria table corruption reported when transactional=0"
+# Bug 35048 "aria table corruption reported when transactional=0"
 #
 
 create table t1 (i int auto_increment not null primary key) transactional=0;
@@ -499,19 +499,19 @@ DROP TABLE t1;
 # BUG#36104 - INFORMATION_SCHEMA.TABLES shows TRANSACTIONAL=1 twice in
 # CREATE_OPTIONS
 #
-create table t1(a int) engine=maria transactional=1;
+create table t1(a int) engine=aria transactional=1;
 select CREATE_OPTIONS from information_schema.TABLES where
 TABLE_SCHEMA='test' and TABLE_NAME='t1';
 drop table t1;
 
 #
-# BUG#39697 - Maria: hang when failing to insert due to UNIQUE
+# BUG#39697 - Aria: hang when failing to insert due to UNIQUE
 #
-create table t1 (a int, unique(a)) engine=maria transactional=1;
+create table t1 (a int, unique(a)) engine=aria transactional=1;
 insert into t1 values(1);
 --error 1062
 insert into t1 values(2),(2);
-create table t2 (a int, unique(a)) engine=maria transactional=0 row_format=dynamic;
+create table t2 (a int, unique(a)) engine=aria transactional=0 row_format=dynamic;
 insert into t2 values(1);
 --error 1062
 insert into t2 values(2),(2);
@@ -527,7 +527,7 @@ drop table t1, t2;
 --disable_result_log
 --disable_query_log
 eval set global storage_engine=$default_engine,
-maria_page_checksum=$default_checksum,
+aria_page_checksum=$default_checksum,
-maria_log_file_size=$default_log_file_size;
+aria_log_file_size=$default_log_file_size;
 --enable_result_log
 --enable_query_log

mysql-test/suite/maria/t/maria_notembedded.test

@@ -4,7 +4,7 @@
 -- source include/have_maria.inc
 
 let $default_engine=`select @@session.storage_engine`;
-set session storage_engine=maria;
+set session storage_engine=aria;
 
 # Verify that INSERT DELAYED is disabled only for transactional tables
 # ("embedded" server translates them to plain INSERT)

mysql-test/suite/maria/t/maria_partition.test

@@ -1,13 +1,13 @@
-# Maria tests which require partitioning enabled
+# Aria tests which require partitioning enabled
 
 --source include/have_partition.inc
 -- source include/have_maria.inc
 
 let $default_engine=`select @@global.storage_engine`;
-let $default_checksum=`select @@global.maria_page_checksum`;
+let $default_checksum=`select @@global.aria_page_checksum`;
-set global storage_engine=maria;
+set global storage_engine=aria;
-set session storage_engine=maria;
+set session storage_engine=aria;
-set global maria_page_checksum=0;
+set global aria_page_checksum=0;
 
 # Initialise
 --disable_warnings
@@ -17,7 +17,7 @@ drop view if exists v1;
 SET SQL_WARNINGS=1;
 
 #
-# Bug #39227 Maria: crash with ALTER TABLE PARTITION
+# Bug #39227 Aria: crash with ALTER TABLE PARTITION
 #
 
 create table t1 (s1 int);
@@ -29,8 +29,8 @@ drop table t1;
 #
 # Test outer join const propagation
 #
-create table t2(a blob) engine=maria;
+create table t2(a blob) engine=aria;
-create table t1(a int primary key) engine=maria;
+create table t1(a int primary key) engine=aria;
 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);
@@ -52,7 +52,7 @@ drop table t1,t2;
 # Set defaults back
 --disable_result_log
 --disable_query_log
-eval set global storage_engine=$default_engine, maria_page_checksum=$default_checksum;
+eval set global storage_engine=$default_engine, aria_page_checksum=$default_checksum;
-set global maria_log_file_size=default;
+set global aria_log_file_size=default;
 --enable_result_log
 --enable_query_log

mysql-test/suite/maria/t/maria_showlog_error.test

@@ -19,9 +19,9 @@ connection default;
 connection default;
 
 let MYSQLD_DATADIR= `select @@datadir`;
-remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000001;
+remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000001;
---replace_regex /Size unknown ; .*maria_log.00000001/Size unknown ; maria_log.00000001/
+--replace_regex /Size unknown ; .*aria_log.00000001/Size unknown ; aria_log.00000001/
-show engine maria logs;
+show engine aria logs;
 
 # cleunup after this test
 -- source include/maria_empty_logs.inc

mysql-test/suite/maria/t/ps_maria.test

@@ -1,6 +1,6 @@
 ###############################################
 #                                             #
-#  Prepared Statements test on MARIA tables  #
+#  Prepared Statements test on ARIA tables  #
 #                                             #
 ###############################################
 
@@ -12,7 +12,7 @@
 
 use test;
 
-let $type= 'MARIA' ;
+let $type= 'ARIA' ;
 -- source include/ps_create.inc
 -- source include/ps_renew.inc
 
@@ -47,6 +47,6 @@ drop table t1, t9;
 
 --disable_result_log
 --disable_query_log
-set global maria_log_file_size=default;
+set global aria_log_file_size=default;
 --enable_result_log
 --enable_query_log

mysql-test/suite/parts/r/partition_auto_increment_maria.result

@@ -3,13 +3,13 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
 c1 INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (c1))
-ENGINE='MARIA';
+ENGINE='Aria';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 SELECT AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='test'
 AND TABLE_NAME='t1';
 AUTO_INCREMENT
@@ -71,20 +71,20 @@ DROP TABLE t1;
 CREATE TABLE t1 (
 c1 INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (c1))
-ENGINE='MARIA';
+ENGINE='Aria';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 INSERT INTO t1 VALUES (4);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -92,7 +92,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 INSERT INTO t1 VALUES (NULL);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -100,7 +100,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 DELETE FROM t1;
 INSERT INTO t1 VALUES (NULL);
 SHOW CREATE TABLE t1;
@@ -108,7 +108,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=7 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria AUTO_INCREMENT=7 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 SELECT * FROM t1 ORDER BY c1;
 c1
 6
@@ -119,7 +119,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 SELECT * FROM t1 ORDER BY c1;
 c1
 1
@@ -134,13 +134,13 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=102 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria AUTO_INCREMENT=102 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
 DROP TABLE t1;
 # Simple test with NULL
 CREATE TABLE t1 (
 c1 INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (c1))
-ENGINE='MARIA'
+ENGINE='Aria'
 PARTITION BY HASH(c1)
 PARTITIONS 2;
 INSERT INTO t1 VALUES (NULL);
@@ -149,7 +149,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 SELECT * FROM t1;
@@ -161,7 +161,7 @@ CREATE TABLE t1 (
 c1 INT,
 c2 INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (c2))
-ENGINE='MARIA'
+ENGINE='Aria'
 PARTITION BY HASH(c2)
 PARTITIONS 2;
 INSERT INTO t1 VALUES (1, NULL);
@@ -179,7 +179,7 @@ CREATE TABLE t1 (
 c1 INT,
 c2 INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (c2))
-ENGINE='MARIA'
+ENGINE='Aria'
 PARTITION BY HASH(c2)
 PARTITIONS 2;
 INSERT INTO t1 VALUES (1, 0);
@@ -200,7 +200,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
 c1 INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (c1))
-ENGINE='MARIA'
+ENGINE='Aria'
 PARTITION BY HASH(c1)
 PARTITIONS 2;
 INSERT INTO t1 VALUES (2), (4), (NULL);
@@ -251,7 +251,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
 c1 INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (c1))
-ENGINE='MARIA'
+ENGINE='Aria'
 PARTITION BY HASH(c1)
 PARTITIONS 2;
 SET @@session.auto_increment_increment = 10;
@@ -299,7 +299,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
 c1 INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (c1))
-ENGINE='MARIA'
+ENGINE='Aria'
 PARTITION BY HASH (c1)
 PARTITIONS 2;
 SELECT AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='test'
@@ -373,7 +373,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=27 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=27 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 SELECT * FROM t1 ORDER BY c1;
@@ -386,7 +386,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=28 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=28 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 SELECT * FROM t1 ORDER BY c1;
@@ -403,14 +403,14 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=102 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=102 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 # Test with two threads
 # con default
 CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1))
-ENGINE = 'MARIA'
+ENGINE = 'Aria'
 PARTITION BY HASH(c1)
 PARTITIONS 2;
 INSERT INTO t1 (c1) VALUES (2);
@@ -449,7 +449,7 @@ DROP TABLE t1;
 # Test with two threads + start transaction NO PARTITIONING
 # con default
 CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1))
-ENGINE = 'MARIA';
+ENGINE = 'Aria';
 START TRANSACTION;
 INSERT INTO t1 (c1) VALUES (2);
 INSERT INTO t1 (c1) VALUES (4);
@@ -530,7 +530,7 @@ DROP TABLE t1;
 # Test with two threads + start transaction
 # con default
 CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1))
-ENGINE = 'MARIA'
+ENGINE = 'Aria'
 PARTITION BY HASH(c1)
 PARTITIONS 2;
 START TRANSACTION;
@@ -612,7 +612,7 @@ CREATE TABLE t1 (
 c1 INT NOT NULL AUTO_INCREMENT,
 c2 INT,
 PRIMARY KEY (c1,c2))
-ENGINE = 'MARIA'
+ENGINE = 'Aria'
 PARTITION BY HASH(c2)
 PARTITIONS 2;
 INSERT INTO t1 VALUES (1, 0);
@@ -642,7 +642,7 @@ CREATE TABLE t1 (
 c1 INT,
 c2 INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (c2))
-ENGINE = 'MARIA'
+ENGINE = 'Aria'
 PARTITION BY HASH(c2)
 PARTITIONS 2;
 INSERT INTO t1 VALUES (1, 0);
@@ -670,7 +670,7 @@ CREATE TABLE t1 (
 c1 INT,
 c2 INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (c1,c2))
-ENGINE = 'MARIA'
+ENGINE = 'Aria'
 PARTITION BY HASH(c2)
 PARTITIONS 2;
 INSERT INTO t1 VALUES (1, 0);
@@ -695,7 +695,7 @@ c1	c2
 DROP TABLE t1;
 # Test AUTO_INCREMENT in CREATE
 CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1))
-ENGINE = 'MARIA'
+ENGINE = 'Aria'
 AUTO_INCREMENT = 15
 PARTITION BY HASH(c1)
 PARTITIONS 2;
@@ -704,7 +704,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 INSERT INTO t1 (c1) VALUES (4);
@@ -713,7 +713,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 INSERT INTO t1 (c1) VALUES (0);
@@ -722,7 +722,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=16 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=16 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 INSERT INTO t1 (c1) VALUES (NULL);
@@ -731,7 +731,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=17 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=17 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 SELECT * FROM t1 ORDER BY c1;
@@ -747,7 +747,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 INSERT INTO t1 (c1) VALUES (0);
@@ -756,7 +756,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 INSERT INTO t1 (c1) VALUES (NULL);
@@ -765,7 +765,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=302 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=302 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 SELECT * FROM t1 ORDER BY c1;
@@ -780,7 +780,7 @@ SET @@session.sql_mode = '';
 DROP TABLE t1;
 # Test SET INSERT_ID
 CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1))
-ENGINE = 'MARIA'
+ENGINE = 'Aria'
 PARTITION BY HASH(c1)
 PARTITIONS 2;
 SHOW CREATE TABLE t1;
@@ -788,7 +788,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1
+) ENGINE=Aria DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 INSERT INTO t1 (c1) VALUES (NULL);
@@ -797,7 +797,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 SELECT * FROM t1;
@@ -809,7 +809,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 INSERT INTO t1 (c1) VALUES (NULL);
@@ -818,7 +818,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=24 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=24 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 SET INSERT_ID = 22;
@@ -835,7 +835,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
 c1 INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (c1))
-ENGINE='MARIA'
+ENGINE='Aria'
 PARTITION BY HASH(c1)
 PARTITIONS 2;
 SHOW CREATE TABLE t1;
@@ -843,7 +843,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1
+) ENGINE=Aria DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 FLUSH TABLE;
@@ -852,7 +852,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA DEFAULT CHARSET=latin1
+) ENGINE=Aria DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 INSERT INTO t1 VALUES (4);
@@ -862,7 +862,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 INSERT INTO t1 VALUES (NULL);
@@ -872,7 +872,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=MARIA AUTO_INCREMENT=6 DEFAULT CHARSET=latin1
+) ENGINE=Aria AUTO_INCREMENT=6 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c1)
 PARTITIONS 2 */
 SELECT * FROM t1 ORDER BY c1;
@@ -886,7 +886,7 @@ DROP TABLE t1;
 ##############################################################################
 # Inserting negative autoincrement values into a partition table (partitions >= 4)
 CREATE TABLE t (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY(c1),
-c2 INT) ENGINE='MARIA' PARTITION BY HASH(c1) PARTITIONS 4;
+c2 INT) ENGINE='Aria' PARTITION BY HASH(c1) PARTITIONS 4;
 INSERT INTO t(c2) VALUES (10);
 INSERT INTO t(c2) VALUES (20);
 INSERT INTO t VALUES (-1,-10);
@@ -903,7 +903,7 @@ DROP TABLE t;
 # Reading from a partition table (partitions >= 2 ) after inserting a negative
 # value into the auto increment column
 CREATE TABLE t (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY(c1),
-c2 INT) ENGINE='MARIA' PARTITION BY HASH(c1) PARTITIONS 2;
+c2 INT) ENGINE='Aria' PARTITION BY HASH(c1) PARTITIONS 2;
 INSERT INTO t VALUES (-2,-20);
 INSERT INTO t(c2) VALUES (30);
 SELECT * FROM t ORDER BY c1 ASC;
@@ -914,7 +914,7 @@ DROP TABLE t;
 # Inserting negative auto increment value into a partition table (partitions >= 2)
 # auto increment value > 2.
 CREATE TABLE t (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY(c1),
-c2 INT) ENGINE='MARIA' PARTITION BY HASH(c1) PARTITIONS 2;
+c2 INT) ENGINE='Aria' PARTITION BY HASH(c1) PARTITIONS 2;
 INSERT INTO t VALUES (-4,-20);
 INSERT INTO t(c2) VALUES (30);
 INSERT INTO t(c2) VALUES (40);
@@ -926,7 +926,7 @@ c1	c2
 DROP TABLE t;
 # Inserting -1 into autoincrement column of a partition table (partition >= 4)
 CREATE TABLE t (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY(c1),
-c2 INT) ENGINE='MARIA' PARTITION BY HASH(c1) PARTITIONS 4;
+c2 INT) ENGINE='Aria' PARTITION BY HASH(c1) PARTITIONS 4;
 INSERT INTO t(c2) VALUES (10);
 INSERT INTO t(c2) VALUES (20);
 INSERT INTO t VALUES (-1,-10);
@@ -945,7 +945,7 @@ c1	c2
 DROP TABLE t;
 # Deleting from an auto increment table after inserting negative values
 CREATE TABLE t (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY(c1),
-c2 INT) ENGINE='MARIA' PARTITION BY HASH(c1) PARTITIONS 4;
+c2 INT) ENGINE='Aria' PARTITION BY HASH(c1) PARTITIONS 4;
 INSERT INTO t(c2) VALUES (10);
 INSERT INTO t(c2) VALUES (20);
 INSERT INTO t VALUES (-1,-10);
@@ -970,7 +970,7 @@ DROP TABLE t;
 # Inserting a positive value that exceeds maximum allowed value for an
 # Auto Increment column (positive maximum)
 CREATE TABLE t (c1 TINYINT NOT NULL AUTO_INCREMENT, PRIMARY KEY(c1),
-c2 INT) ENGINE='MARIA' PARTITION BY HASH(c1) PARTITIONS 4;
+c2 INT) ENGINE='Aria' PARTITION BY HASH(c1) PARTITIONS 4;
 INSERT INTO t(c2) VALUES (10);
 INSERT INTO t(c2) VALUES (20);
 INSERT INTO t VALUES (126,30);
@@ -989,7 +989,7 @@ DROP TABLE t;
 # Inserting a negative value that goes below minimum allowed value for an
 # Auto Increment column (negative minimum)
 CREATE TABLE t (c1 TINYINT NOT NULL AUTO_INCREMENT, PRIMARY KEY(c1),
-c2 INT) ENGINE='MARIA' PARTITION BY HASH(c1) PARTITIONS 4;
+c2 INT) ENGINE='Aria' PARTITION BY HASH(c1) PARTITIONS 4;
 INSERT INTO t(c2) VALUES (10);
 INSERT INTO t(c2) VALUES (20);
 INSERT INTO t VALUES (-127,30);
@@ -1007,7 +1007,7 @@ c1	c2
 DROP TABLE t;
 # Updating the partition table with a negative Auto Increment value
 CREATE TABLE t (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY(c1),
-c2 INT) ENGINE='MARIA' PARTITION BY HASH(c1) PARTITIONS 4;
+c2 INT) ENGINE='Aria' PARTITION BY HASH(c1) PARTITIONS 4;
 INSERT INTO t(c2) VALUES (10);
 INSERT INTO t(c2) VALUES (20);
 INSERT INTO t VALUES (-1,-10);
@@ -1040,7 +1040,7 @@ DROP TABLE t;
 # Updating the partition table with a value that crosses the upper limits
 # on both the positive and the negative side.
 CREATE TABLE t (c1 TINYINT NOT NULL AUTO_INCREMENT, PRIMARY KEY(c1),
-c2 INT) ENGINE='MARIA' PARTITION BY HASH(c1) PARTITIONS 4;
+c2 INT) ENGINE='Aria' PARTITION BY HASH(c1) PARTITIONS 4;
 INSERT INTO t(c2) VALUES (10);
 INSERT INTO t(c2) VALUES (20);
 INSERT INTO t VALUES (126,30);

mysql-test/suite/parts/t/partition_alter2_1_maria.test

@@ -3,7 +3,7 @@
 #                                                                              #
 # Purpose:                                                                     #
 #  Tests around Alter column used in partitioning function                     #
-#        MARIA branch                                                          #
+#        Aria branch                                                          #
 #                                                                              #
 #------------------------------------------------------------------------------#
 # Original Author: mleich                                                      #
@@ -14,7 +14,7 @@
 ################################################################################
 
 #
-# NOTE: PLEASE DO NOT ADD NOT MARIA SPECIFIC TESTCASES HERE !
+# NOTE: PLEASE DO NOT ADD NOT Aria SPECIFIC TESTCASES HERE !
 #       TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN
 #       THE SOURCED FILES ONLY.
 #
@@ -54,14 +54,14 @@ let $more_pk_ui_tests= 0;
 
 ##### Storage engine to be tested
 --source include/have_maria.inc
-let $engine= 'MARIA';
+let $engine= 'Aria';
 
 ##### Execute the test of "table" files
-# MARIA has files per PK, UI, ...
+# Aria has files per PK, UI, ...
 let $do_file_tests= 1;
 
 ##### Execute PRIMARY KEY tests                                      #####
-# AFAIK MARIA treats PRIMARY KEYs like UNIQUE INDEXes
+# AFAIK Aria treats PRIMARY KEYs like UNIQUE INDEXes
 let $do_pk_tests= 0;
 
 ##### Assign a big number smaller than the maximum value for partitions  #####

mysql-test/suite/parts/t/partition_alter2_2_maria.test

@@ -3,7 +3,7 @@
 #                                                                              #
 # Purpose:                                                                     #
 #  Tests around Alter column used in partitioning function                     #
-#        MARIA branch                                                          #
+#        Aria branch                                                          #
 #                                                                              #
 #------------------------------------------------------------------------------#
 # Original Author: mleich                                                      #
@@ -14,7 +14,7 @@
 ################################################################################
 
 #
-# NOTE: PLEASE DO NOT ADD NOT MARIA SPECIFIC TESTCASES HERE !
+# NOTE: PLEASE DO NOT ADD NOT Aria SPECIFIC TESTCASES HERE !
 #       TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN
 #       THE SOURCED FILES ONLY.
 #
@@ -54,14 +54,14 @@ let $more_pk_ui_tests= 0;
 
 ##### Storage engine to be tested
 --source include/have_maria.inc
-let $engine= 'MARIA';
+let $engine= 'Aria';
 
 ##### Execute the test of "table" files
 # MAARIA has files per PK, UI, ...
 let $do_file_tests= 1;
 
 ##### Execute PRIMARY KEY tests                                      #####
-# AFAIK MARIA treats PRIMARY KEYs like UNIQUE INDEXes
+# AFAIK Aria treats PRIMARY KEYs like UNIQUE INDEXes
 let $do_pk_tests= 0;
 
 ##### Assign a big number smaller than the maximum value for partitions  #####

mysql-test/suite/parts/t/partition_auto_increment_maria.test

@@ -27,7 +27,7 @@
 
 ##### Storage engine to be tested
 --source include/have_maria.inc
-let $engine= 'MARIA';
+let $engine= 'Aria';
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines

mysql-test/t/bug46080-master.opt

@@ -1 +1 @@
---skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=20000000 --loose-maria-pagecache-buffer-size=1M
+--skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=20000000 --loose-aria-pagecache-buffer-size=1M

mysql-test/t/create.test

@@ -1384,11 +1384,11 @@ drop function f1;
 # Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA
 #
 create table t1 like information_schema.processlist;
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
+--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 show create table t1;
 drop table t1;
 create temporary table t1 like information_schema.processlist;
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
+--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 show create table t1;
 drop table t1;
 create table t1 like information_schema.character_sets;

scripts/make_binary_distribution.sh

@@ -431,9 +431,9 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
   extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \
   storage/myisam/myisamchk$BS storage/myisam/myisampack$BS \
   storage/myisam/myisamlog$BS storage/myisam/myisam_ftdump$BS \
-  storage/maria/maria_chk$BS storage/maria/maria_pack$BS \
+  storage/maria/aria_chk$BS storage/maria/aria_pack$BS \
-  storage/maria/maria_ftdump$BS storage/maria/maria_read_log$BS \
+  storage/maria/aria_ftdump$BS storage/maria/aria_read_log$BS \
-  storage/maria/maria_dump_log$BS \
+  storage/maria/aria_dump_log$BS \
   sql/mysqld$BS sql/mysqld-debug$BS \
   sql/mysql_tzinfo_to_sql$BS \
   server-tools/instance-manager/mysqlmanager$BS \

scripts/make_win_bin_dist

@@ -141,7 +141,7 @@ fi
 # Copy executables, and client DLL
 # ----------------------------------------------------------------------
 MYISAM_BINARIES="myisamchk myisamlog myisampack myisam_ftdump"
-MARIA_BINARIES="maria_chk maria_dump_log maria_ftdump maria_pack maria_read_log"
+MARIA_BINARIES="aria_chk aria_dump_log aria_ftdump aria_pack aria_read_log"
 mkdir $DESTDIR
 mkdir $DESTDIR/bin
 cp client/$TARGET/*.exe                                  $DESTDIR/bin/

sql/handler.cc

@@ -59,7 +59,7 @@ static const LEX_STRING sys_table_aliases[]=
   { C_STRING_WITH_LEN("NDB") },       { C_STRING_WITH_LEN("NDBCLUSTER") },
   { C_STRING_WITH_LEN("HEAP") },      { C_STRING_WITH_LEN("MEMORY") },
   { C_STRING_WITH_LEN("MERGE") },     { C_STRING_WITH_LEN("MRG_MYISAM") },
-  { C_STRING_WITH_LEN("Aria") },      { C_STRING_WITH_LEN("Maria") },
+  { C_STRING_WITH_LEN("Maria") },      { C_STRING_WITH_LEN("Aria") },
   {NullS, 0}
 };
 

sql/mysqld.cc

@@ -3048,7 +3048,7 @@ int my_message_sql(uint error, const char *str, myf MyFlags)
   {
     /* At least, prevent new abuse ... */
     DBUG_ASSERT(strncmp(str, "MyISAM table", 12) == 0 ||
-                strncmp(str, "MARIA table", 11) == 0);
+                strncmp(str, "Aria table", 11) == 0);
     error= ER_UNKNOWN_ERROR;
   }
 
@@ -4316,10 +4316,10 @@ a file name for --log-bin-index option", opt_binlog_index_name);
       pthread_mutex_unlock(&LOCK_global_system_variables);
     }
   }
-#if defined(WITH_MARIA_STORAGE_ENGINE) && defined(USE_MARIA_FOR_TMP_TABLES)
+#if defined(WITH_ARIA_STORAGE_ENGINE) && defined(USE_MARIA_FOR_TMP_TABLES)
   if (!ha_storage_engine_is_enabled(maria_hton) && !opt_bootstrap)
   {
-    sql_print_error("Maria engine is not enabled or did not start. The Maria engine must be enabled to continue as mysqld was configured with --with-maria-tmp-tables");
+    sql_print_error("Aria engine is not enabled or did not start. The Aria engine must be enabled to continue as mysqld was configured with --with-aria-tmp-tables");
     unireg_abort(1);
   }
 #endif
@@ -7537,7 +7537,7 @@ thread is in the relay logs.",
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"tmp_table_size", OPT_TMP_TABLE_SIZE,
    "If an internal in-memory temporary table exceeds this size, MySQL will "
-   "automatically convert it to an on-disk MyISAM/Maria table.",
+   "automatically convert it to an on-disk MyISAM/Aria table.",
    &global_system_variables.tmp_table_size,
    &max_system_variables.tmp_table_size, 0, GET_ULL,
    REQUIRED_ARG, 16*1024*1024L, 1024, MAX_MEM_TABLE_SIZE, 0, 1, 0},

sql/set_var.cc

@@ -58,7 +58,7 @@
 #include <my_getopt.h>
 #include <thr_alarm.h>
 #include <myisam.h>
-#ifdef WITH_MARIA_STORAGE_ENGINE
+#ifdef WITH_ARIA_STORAGE_ENGINE
 #include <maria.h>
 #endif
 #include <my_dir.h>
@@ -1220,21 +1220,21 @@ extern void fix_delay_key_write(THD *thd, enum_var_type type)
   switch ((enum_delay_key_write) delay_key_write_options) {
   case DELAY_KEY_WRITE_NONE:
     myisam_delay_key_write=0;
-#ifdef WITH_MARIA_STORAGE_ENGINE
+#ifdef WITH_ARIA_STORAGE_ENGINE
     maria_delay_key_write= 0;
 #endif
     ha_open_options&= ~HA_OPEN_DELAY_KEY_WRITE;
     break;
   case DELAY_KEY_WRITE_ON:
     myisam_delay_key_write=1;
-#ifdef WITH_MARIA_STORAGE_ENGINE
+#ifdef WITH_ARIA_STORAGE_ENGINE
     maria_delay_key_write= 1;
 #endif
     ha_open_options&= ~HA_OPEN_DELAY_KEY_WRITE;
     break;
   case DELAY_KEY_WRITE_ALL:
     myisam_delay_key_write=1;
-#ifdef WITH_MARIA_STORAGE_ENGINE
+#ifdef WITH_ARIA_STORAGE_ENGINE
     maria_delay_key_write= 1;
 #endif
     ha_open_options|= HA_OPEN_DELAY_KEY_WRITE;

sql/sql_class.h

@@ -2757,7 +2757,7 @@ public:
 };
 
 
-#if defined(WITH_MARIA_STORAGE_ENGINE) && defined(USE_MARIA_FOR_TMP_TABLES)
+#if defined(WITH_ARIA_STORAGE_ENGINE) && defined(USE_MARIA_FOR_TMP_TABLES)
 #include <maria.h>
 #define ENGINE_COLUMNDEF MARIA_COLUMNDEF
 #else

sql/sql_parse.cc

@@ -28,7 +28,7 @@
 #include "events.h"
 #include "sql_trigger.h"
 
-#ifdef WITH_MARIA_STORAGE_ENGINE
+#ifdef WITH_ARIA_STORAGE_ENGINE
 #include "../storage/maria/ha_maria.h"
 #endif
 
@@ -181,7 +181,7 @@ bool end_active_trans(THD *thd)
     thd->server_status&= ~SERVER_STATUS_IN_TRANS;
     if (ha_commit(thd))
       error=1;
-#ifdef WITH_MARIA_STORAGE_ENGINE
+#ifdef WITH_ARIA_STORAGE_ENGINE
     ha_maria::implicit_commit(thd, TRUE);
 #endif
   }
@@ -1208,7 +1208,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
     {
       char *beginning_of_next_stmt= (char*) end_of_stmt;
 
-#ifdef WITH_MARIA_STORAGE_ENGINE
+#ifdef WITH_ARIA_STORAGE_ENGINE
       ha_maria::implicit_commit(thd, FALSE);
 #endif
 
@@ -1622,7 +1622,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
 
   thd->transaction.stmt.reset();
 
-#ifdef WITH_MARIA_STORAGE_ENGINE
+#ifdef WITH_ARIA_STORAGE_ENGINE
   ha_maria::implicit_commit(thd, FALSE);
 #endif
 

sql/sql_select.cc

@@ -37,7 +37,7 @@
 #include <my_bit.h>
 #include <hash.h>
 #include <ft_global.h>
-#if defined(WITH_MARIA_STORAGE_ENGINE) && defined(USE_MARIA_FOR_TMP_TABLES)
+#if defined(WITH_ARIA_STORAGE_ENGINE) && defined(USE_MARIA_FOR_TMP_TABLES)
 #include "../storage/maria/ha_maria.h"
 #define TMP_ENGINE_HTON maria_hton
 #else
@@ -10083,7 +10083,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
 
   /*
     No need to change table name to lower case as we are only creating
-    MyISAM, Maria or HEAP tables here
+    MyISAM, Aria or HEAP tables here
   */
   fn_format(path, tmp_table_name, mysql_tmpdir, "",
             MY_REPLACE_EXT|MY_UNPACK_FILENAME);
@@ -10854,9 +10854,9 @@ static bool open_tmp_table(TABLE *table)
 }
 
 
-#if defined(WITH_MARIA_STORAGE_ENGINE) && defined(USE_MARIA_FOR_TMP_TABLES)
+#if defined(WITH_ARIA_STORAGE_ENGINE) && defined(USE_MARIA_FOR_TMP_TABLES)
 
-/* Create internal Maria temporary table */
+/* Create internal Aria temporary table */
 
 static bool create_internal_tmp_table(TABLE *table,TMP_TABLE_PARAM *param,
                                       ulonglong options)
@@ -10936,7 +10936,7 @@ static bool create_internal_tmp_table(TABLE *table,TMP_TABLE_PARAM *param,
 	seg->null_pos= (uint) (field->null_ptr - (uchar*) table->record[0]);
 	/*
 	  We are using a GROUP BY on something that contains NULL
-	  In this case we have to tell Maria that two NULL should
+	  In this case we have to tell Aria that two NULL should
 	  on INSERT be regarded at the same value
 	*/
 	if (!using_unique_constraint)
@@ -10982,7 +10982,7 @@ bool create_internal_tmp_table_from_heap(THD *thd, TABLE *table,
   return create_internal_tmp_table_from_heap2(thd, table, param, error,
                                               ignore_last_dupp_key_error,
                                               maria_hton,
-                                              "converting HEAP to Maria");
+                                              "converting HEAP to Aria");
 }
 
 #else

storage/maria/CMakeLists.txt

@@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
                     ${CMAKE_SOURCE_DIR}/sql
                     ${CMAKE_SOURCE_DIR}/regex
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)
-SET(MARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c 
+SET(ARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c 
             ma_rnext.c ma_rnext_same.c 
             ma_search.c ma_page.c ma_key_recover.c ma_key.c 
             ma_locking.c ma_state.c
@@ -48,50 +48,50 @@ SET(MARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c
             ha_maria.h maria_def.h ma_recovery_util.c ma_servicethread.c
 )
 
-MYSQL_STORAGE_ENGINE(MARIA)
+MYSQL_STORAGE_ENGINE(ARIA)
 IF(NOT SOURCE_SUBLIBS)
 
-  ADD_DEPENDENCIES(maria GenError)
+  ADD_DEPENDENCIES(aria GenError)
 
-ADD_EXECUTABLE(maria_ftdump maria_ftdump.c)
+ADD_EXECUTABLE(aria_ftdump maria_ftdump.c)
-TARGET_LINK_LIBRARIES(maria_ftdump maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(aria_ftdump aria myisam mysys dbug strings zlib wsock32)
 
-ADD_EXECUTABLE(maria_chk maria_chk.c)
+ADD_EXECUTABLE(aria_chk maria_chk.c)
-TARGET_LINK_LIBRARIES(maria_chk maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(aria_chk aria myisam mysys dbug strings zlib wsock32)
 
-ADD_EXECUTABLE(maria_read_log maria_read_log.c)
+ADD_EXECUTABLE(aria_read_log maria_read_log.c)
-TARGET_LINK_LIBRARIES(maria_read_log maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(aria_read_log aria myisam mysys dbug strings zlib wsock32)
 
-ADD_EXECUTABLE(maria_pack maria_pack.c)
+ADD_EXECUTABLE(aria_pack maria_pack.c)
-TARGET_LINK_LIBRARIES(maria_pack maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(aria_pack aria myisam mysys dbug strings zlib wsock32)
 
-ADD_EXECUTABLE(maria_dump_log ma_loghandler.c unittest/ma_loghandler_examples.c)
+ADD_EXECUTABLE(aria_dump_log ma_loghandler.c unittest/ma_loghandler_examples.c)
-TARGET_LINK_LIBRARIES(maria_dump_log maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(aria_dump_log aria myisam mysys dbug strings zlib wsock32)
-SET_TARGET_PROPERTIES(maria_dump_log PROPERTIES COMPILE_FLAGS "-DMARIA_DUMP_LOG")
+SET_TARGET_PROPERTIES(aria_dump_log PROPERTIES COMPILE_FLAGS "-DMARIA_DUMP_LOG")
 
 ADD_EXECUTABLE(ma_test1 ma_test1.c)
-TARGET_LINK_LIBRARIES(ma_test1 maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_test1 aria myisam mysys dbug strings zlib wsock32)
 
 ADD_EXECUTABLE(ma_test2 ma_test2.c)
-TARGET_LINK_LIBRARIES(ma_test2 maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_test2 aria myisam mysys dbug strings zlib wsock32)
 
 ADD_EXECUTABLE(ma_test3 ma_test3.c)
-TARGET_LINK_LIBRARIES(ma_test3 maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_test3 aria myisam mysys dbug strings zlib wsock32)
 
 ADD_EXECUTABLE(ma_rt_test ma_rt_test.c)
-TARGET_LINK_LIBRARIES(ma_rt_test maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_rt_test aria myisam mysys dbug strings zlib wsock32)
 
 ADD_EXECUTABLE(ma_sp_test ma_sp_test.c)
-TARGET_LINK_LIBRARIES(ma_sp_test maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_sp_test aria myisam mysys dbug strings zlib wsock32)
 
 IF(EMBED_MANIFESTS)
-  MYSQL_EMBED_MANIFEST("maria_ftdump" "asInvoker")
+  MYSQL_EMBED_MANIFEST("aria_ftdump" "asInvoker")
-  MYSQL_EMBED_MANIFEST("maria_chk" "asInvoker")
+  MYSQL_EMBED_MANIFEST("aria_chk" "asInvoker")
-  MYSQL_EMBED_MANIFEST("maria_read_log" "asInvoker")
+  MYSQL_EMBED_MANIFEST("aria_read_log" "asInvoker")
-  MYSQL_EMBED_MANIFEST("maria_pack" "asInvoker")
+  MYSQL_EMBED_MANIFEST("aria_pack" "asInvoker")
 ENDIF(EMBED_MANIFESTS)
 
-INSTALL(TARGETS maria_ftdump maria_chk maria_read_log maria_pack maria_dump_log
+INSTALL(TARGETS aria_ftdump aria_chk aria_read_log aria_pack aria_dump_log
 	DESTINATION bin COMPONENT runtime)
 
 ENDIF(NOT SOURCE_SUBLIBS)

storage/maria/Makefile.am

@@ -27,44 +27,47 @@ LDADD =
 
 DEFS =                  @DEFS@
 
-# "." is needed first because tests in unittest need libmaria
+# "." is needed first because tests in unittest need libaria
 SUBDIRS =		. unittest
 
 EXTRA_DIST =		ma_test_all.sh ma_test_all.res ma_test_big.sh \
 			ma_ft_stem.c CMakeLists.txt plug.in ma_test_recovery
 pkgdata_DATA =		
-pkglib_LIBRARIES =	libmaria.a
+pkglib_LIBRARIES =	libaria.a
-bin_PROGRAMS =		maria_chk maria_pack maria_ftdump maria_read_log \
+bin_PROGRAMS =		aria_chk aria_pack aria_ftdump aria_read_log \
-			maria_dump_log
+			aria_dump_log
-maria_chk_DEPENDENCIES=	$(LIBRARIES)
+aria_chk_DEPENDENCIES=	$(LIBRARIES)
 # Only reason to link with libmyisam.a here is that it's where some fulltext
-# pieces are (but soon we'll remove fulltext dependencies from Maria).
+# pieces are (but soon we'll remove fulltext dependencies from Aria).
 # For now, it imposes that storage/myisam be built before storage/maria.
-maria_chk_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+aria_chk_SOURCES=	maria_chk.c
+aria_chk_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-maria_pack_DEPENDENCIES=$(LIBRARIES)
+aria_pack_SOURCES=	maria_pack.c
-maria_pack_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+aria_pack_DEPENDENCIES=$(LIBRARIES)
+aria_pack_LDADD=	@CLIENT_EXTRA_LDFLAGS@ libaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-maria_read_log_DEPENDENCIES=$(LIBRARIES)
+aria_read_log_SOURCES=	maria_read_log.c
-maria_read_log_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+aria_read_log_DEPENDENCIES=$(LIBRARIES)
+aria_read_log_LDADD=	@CLIENT_EXTRA_LDFLAGS@ libaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-maria_dump_log_DEPENDENCIES=$(LIBRARIES) ma_loghandler.c
+aria_dump_log_DEPENDENCIES=$(LIBRARIES) ma_loghandler.c
-maria_dump_log_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+aria_dump_log_LDADD=	@CLIENT_EXTRA_LDFLAGS@ libaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \
                         $(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-maria_dump_log_SOURCES= ma_loghandler.c unittest/ma_loghandler_examples.c
+aria_dump_log_SOURCES= 	ma_loghandler.c unittest/ma_loghandler_examples.c
-maria_dump_log_CPPFLAGS= -DMARIA_DUMP_LOG
+aria_dump_log_CPPFLAGS= -DMARIA_DUMP_LOG
 noinst_PROGRAMS =	ma_test1 ma_test2 ma_test3 ma_rt_test ma_sp_test
 noinst_HEADERS =	maria_def.h ma_rt_index.h ma_rt_key.h ma_rt_mbr.h \
 			ma_sp_defs.h ma_fulltext.h ma_ftdefs.h ma_ft_test1.h \
@@ -76,44 +79,45 @@ noinst_HEADERS =	maria_def.h ma_rt_index.h ma_rt_key.h ma_rt_mbr.h \
 			ma_key_recover.h ma_recovery_util.h \
 			ma_servicethread.h
 ma_test1_DEPENDENCIES=	$(LIBRARIES)
-ma_test1_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+ma_test1_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
 ma_test2_DEPENDENCIES=	$(LIBRARIES)
-ma_test2_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+ma_test2_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
 ma_test3_DEPENDENCIES=	$(LIBRARIES)
-ma_test3_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+ma_test3_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
 #ma_ft_test1_DEPENDENCIES=	$(LIBRARIES)
 #ma_ft_eval_DEPENDENCIES=	$(LIBRARIES)
-maria_ftdump_DEPENDENCIES=	$(LIBRARIES)
+aria_ftdump_SOURCES=	maria_ftdump.c
-maria_ftdump_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+aria_ftdump_DEPENDENCIES= $(LIBRARIES)
+aria_ftdump_LDADD=	@CLIENT_EXTRA_LDFLAGS@ libaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
 ma_rt_test_DEPENDENCIES=	$(LIBRARIES)
-ma_rt_test_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+ma_rt_test_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
 ma_sp_test_DEPENDENCIES=	$(LIBRARIES)
-ma_sp_test_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+ma_sp_test_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-libmaria_a_SOURCES =	ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \
+libaria_a_SOURCES =	ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \
 			ma_rnext.c ma_rnext_same.c \
 			ma_search.c ma_page.c ma_key_recover.c ma_key.c \
 			ma_locking.c ma_state.c \
@@ -137,7 +141,7 @@ libmaria_a_SOURCES =	ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \
 			ma_checkpoint.c ma_recovery.c ma_commit.c \
 			ma_pagecrc.c ma_recovery_util.c \
 			ha_maria.cc ma_servicethread.c
-CLEANFILES =		test?.MA? FT?.MA? isam.log ma_test_all ma_rt_test.MA? sp_test.MA? maria_log_control maria_log.0000*
+CLEANFILES =		test?.MA? FT?.MA? isam.log ma_test_all ma_rt_test.MA? sp_test.MA? aria_log_control aria_log.0000*
 
 SUFFIXES = .sh
 

storage/maria/ha_maria.cc

@@ -144,7 +144,7 @@ static void update_log_file_size(MYSQL_THD thd,
 
 static MYSQL_SYSVAR_ULONG(block_size, maria_block_size,
        PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-       "Block size to be used for MARIA index pages.", 0, 0,
+       "Block size to be used for Aria index pages.", 0, 0,
        MARIA_KEY_BLOCK_LENGTH, MARIA_MIN_KEY_BLOCK_LENGTH,
        MARIA_MAX_KEY_BLOCK_LENGTH, MARIA_MIN_KEY_BLOCK_LENGTH);
 
@@ -184,7 +184,7 @@ static MYSQL_SYSVAR_ULONG(log_file_size, log_file_size,
 
 static MYSQL_SYSVAR_ENUM(group_commit, maria_group_commit,
        PLUGIN_VAR_RQCMDARG,
-       "Specifies maria group commit mode. "
+       "Specifies Aria group commit mode. "
        "Possible values are \"none\" (no group commit), "
        "\"hard\" (with waiting to actual commit), "
        "\"soft\" (no wait for commit (DANGEROUS!!!))",
@@ -197,12 +197,12 @@ static MYSQL_SYSVAR_ULONG(group_commit_interval, maria_group_commit_interval,
        " 0 stands for no waiting"
        " for other threads to come and do a commit in \"hard\" mode and no"
        " sync()/commit at all in \"soft\" mode.  Option has only an effect"
-       " if maria_group_commit is used",
+       " if aria_group_commit is used",
        NULL, update_maria_group_commit_interval, 0, 0, UINT_MAX, 1);
 
 static MYSQL_SYSVAR_ENUM(log_purge_type, log_purge_type,
        PLUGIN_VAR_RQCMDARG,
-       "Specifies how maria transactional log will be purged. "
+       "Specifies how aria transactional log will be purged. "
        "Possible values of name are \"immediate\", \"external\" "
        "and \"at_flush\"",
        NULL, NULL, TRANSLOG_PURGE_IMMIDIATE,
@@ -224,7 +224,7 @@ static MYSQL_SYSVAR_ULONG(pagecache_age_threshold,
 
 static MYSQL_SYSVAR_ULONGLONG(pagecache_buffer_size, pagecache_buffer_size,
        PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-       "The size of the buffer used for index blocks for Maria tables. "
+       "The size of the buffer used for index blocks for Aria tables. "
        "Increase this to get better index handling (for all reads and "
        "multiple writes) to as much as you can afford.", 0, 0,
        KEY_CACHE_SIZE, MALLOC_OVERHEAD, ~(ulong) 0, IO_SIZE);
@@ -241,7 +241,7 @@ static MYSQL_SYSVAR_ENUM(recover, maria_recover_options, PLUGIN_VAR_OPCMDARG,
        NULL, NULL, HA_RECOVER_DEFAULT, &maria_recover_typelib);
 
 static MYSQL_THDVAR_ULONG(repair_threads, PLUGIN_VAR_RQCMDARG,
-       "Number of threads to use when repairing maria tables. The value of 1 "
+       "Number of threads to use when repairing Aria tables. The value of 1 "
        "disables parallel repair.",
        0, 0, 1, 1, ~0L, 1);
 
@@ -251,7 +251,7 @@ static MYSQL_THDVAR_ULONG(sort_buffer_size, PLUGIN_VAR_RQCMDARG,
        0, 0, 128L*1024L*1024L, 4, ~0L, 1);
 
 static MYSQL_THDVAR_ENUM(stats_method, PLUGIN_VAR_RQCMDARG,
-       "Specifies how maria index statistics collection code should treat "
+       "Specifies how Aria index statistics collection code should treat "
        "NULLs. Possible values are \"nulls_unequal\", \"nulls_equal\", "
        "and \"nulls_ignored\".", 0, 0, 0, &maria_stats_method_typelib);
 
@@ -269,7 +269,7 @@ static my_bool use_maria_for_temp_tables= 0;
 
 static MYSQL_SYSVAR_BOOL(used_for_temp_tables, 
        use_maria_for_temp_tables, PLUGIN_VAR_READONLY | PLUGIN_VAR_NOCMDOPT,
-       "Whether temporary tables should be MyISAM or Maria", 0, 0,
+       "Whether temporary tables should be MyISAM or Aria", 0, 0,
        1);
 
 /*****************************************************************************
@@ -1464,7 +1464,7 @@ int ha_maria::repair(THD *thd, HA_CHECK *param, bool do_optimize)
   if (file->dfile.file == -1)
   {
     sql_print_information("Retrying repair of: '%s' failed. "
-                          "Please try REPAIR EXTENDED or maria_chk",
+                          "Please try REPAIR EXTENDED or aria_chk",
                           table->s->path.str);
     DBUG_RETURN(HA_ADMIN_FAILED);
   }
@@ -3199,7 +3199,7 @@ static my_bool translog_callback_delete_all(const char *directory,
 
 
 /**
-  Helper function for option maria-force-start-after-recovery-failures.
+  Helper function for option aria-force-start-after-recovery-failures.
   Deletes logs if too many failures. Otherwise, increments the counter of
   failures in the control file.
   Notice how this has to be called _before_ translog_init() (if log is
@@ -3215,9 +3215,9 @@ static int mark_recovery_start(const char* log_dir)
   DBUG_ENTER("mark_recovery_start");
   if (unlikely(maria_recover_options == HA_RECOVER_NONE))
     ma_message_no_user(ME_JUST_WARNING, "Please consider using option"
-                       " --maria-recover[=...] to automatically check and"
+                       " --aria-recover[=...] to automatically check and"
                        " repair tables when logs are removed by option"
-                       " --maria-force-start-after-recovery-failures=#");
+                       " --aria-force-start-after-recovery-failures=#");
   if (recovery_failures >= force_start_after_recovery_failures)
   {
     /*
@@ -3243,9 +3243,9 @@ static int mark_recovery_start(const char* log_dir)
 
 
 /**
-  Helper function for option maria-force-start-after-recovery-failures.
+  Helper function for option aria-force-start-after-recovery-failures.
   Records in the control file that recovery was a success, so that it's not
-  counted for maria-force-start-after-recovery-failures.
+  counted for aria-force-start-after-recovery-failures.
 */
 
 static int mark_recovery_success(void)
@@ -3525,25 +3525,25 @@ static void update_log_file_size(MYSQL_THD thd,
 
 
 static SHOW_VAR status_variables[]= {
-  {"Maria_pagecache_blocks_not_flushed", (char*) &maria_pagecache_var.global_blocks_changed, SHOW_LONG_NOFLUSH},
+  {"Aria_pagecache_blocks_not_flushed", (char*) &maria_pagecache_var.global_blocks_changed, SHOW_LONG_NOFLUSH},
-  {"Maria_pagecache_blocks_unused",      (char*) &maria_pagecache_var.blocks_unused, SHOW_LONG_NOFLUSH},
+  {"Aria_pagecache_blocks_unused",      (char*) &maria_pagecache_var.blocks_unused, SHOW_LONG_NOFLUSH},
-  {"Maria_pagecache_blocks_used",        (char*) &maria_pagecache_var.blocks_used, SHOW_LONG_NOFLUSH},
+  {"Aria_pagecache_blocks_used",        (char*) &maria_pagecache_var.blocks_used, SHOW_LONG_NOFLUSH},
-  {"Maria_pagecache_read_requests",      (char*) &maria_pagecache_var.global_cache_r_requests, SHOW_LONGLONG},
+  {"Aria_pagecache_read_requests",      (char*) &maria_pagecache_var.global_cache_r_requests, SHOW_LONGLONG},
-  {"Maria_pagecache_reads",              (char*) &maria_pagecache_var.global_cache_read, SHOW_LONGLONG},
+  {"Aria_pagecache_reads",              (char*) &maria_pagecache_var.global_cache_read, SHOW_LONGLONG},
-  {"Maria_pagecache_write_requests",     (char*) &maria_pagecache_var.global_cache_w_requests, SHOW_LONGLONG},
+  {"Aria_pagecache_write_requests",     (char*) &maria_pagecache_var.global_cache_w_requests, SHOW_LONGLONG},
-  {"Maria_pagecache_writes",             (char*) &maria_pagecache_var.global_cache_write, SHOW_LONGLONG},
+  {"Aria_pagecache_writes",             (char*) &maria_pagecache_var.global_cache_write, SHOW_LONGLONG},
-  {"Maria_transaction_log_syncs",        (char*) &translog_syncs, SHOW_LONGLONG},
+  {"Aria_transaction_log_syncs",        (char*) &translog_syncs, SHOW_LONGLONG},
   {NullS, NullS, SHOW_LONG}
 };
 
 struct st_mysql_storage_engine maria_storage_engine=
 { MYSQL_HANDLERTON_INTERFACE_VERSION };
 
-mysql_declare_plugin(maria)
+mysql_declare_plugin(aria)
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
   &maria_storage_engine,
-  "MARIA",
+  "Aria",
   "Monty Program Ab",
   "Crash-safe tables with MyISAM heritage",
   PLUGIN_LICENSE_GPL,
@@ -3555,12 +3555,12 @@ mysql_declare_plugin(maria)
   NULL
 }
 mysql_declare_plugin_end;
-maria_declare_plugin(maria)
+maria_declare_plugin(aria)
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
   &maria_storage_engine,
-  "MARIA",
+  "Aria",
-  "MySQL AB",
+  "Monty Program Ab",
   "Crash-safe tables with MyISAM heritage",
   PLUGIN_LICENSE_GPL,
   ha_maria_init,              /* Plugin Init                     */

storage/maria/ha_maria.h

@@ -53,7 +53,7 @@ public:
   ~ha_maria() {}
   handler *clone(MEM_ROOT *mem_root);
   const char *table_type() const
-  { return "MARIA"; }
+  { return "Aria"; }
   const char *index_type(uint key_number);
   const char **bas_ext() const;
   ulonglong table_flags() const

storage/maria/ma_check.c

@@ -2518,7 +2518,7 @@ int maria_repair(HA_CHECK *param, register MARIA_HA *info,
   start_records= share->state.state.records;
   if (!(param->testflag & T_SILENT))
   {
-    printf("- recovering (with keycache) MARIA-table '%s'\n",name);
+    printf("- recovering (with keycache) Aria-table '%s'\n",name);
     printf("Data records: %s\n", llstr(start_records, llbuff));
   }
 
@@ -3003,7 +3003,7 @@ int maria_sort_index(HA_CHECK *param, register MARIA_HA *info, char *name)
       DBUG_RETURN(0);
 
   if (!(param->testflag & T_SILENT))
-    printf("- Sorting index for MARIA-table '%s'\n",name);
+    printf("- Sorting index for Aria-table '%s'\n",name);
 
   if (protect_against_repair_crash(info, param, FALSE))
     DBUG_RETURN(1);
@@ -3235,7 +3235,7 @@ static my_bool maria_zerofill_index(HA_CHECK *param, MARIA_HA *info,
   DBUG_ENTER("maria_zerofill_index");
 
   if (!(param->testflag & T_SILENT))
-    printf("- Zerofilling index for MARIA-table '%s'\n",name);
+    printf("- Zerofilling index for Aria-table '%s'\n",name);
 
   /* Go through the index file */
   for (pos= share->base.keystart, page= (ulonglong) (pos / block_size);
@@ -3327,7 +3327,7 @@ static my_bool maria_zerofill_data(HA_CHECK *param, MARIA_HA *info,
     DBUG_RETURN(0);
 
   if (!(param->testflag & T_SILENT))
-    printf("- Zerofilling data  for MARIA-table '%s'\n",name);
+    printf("- Zerofilling data  for Aria-table '%s'\n",name);
 
   /* Go through the record file */
   for (page= 1, pos= block_size;
@@ -3586,7 +3586,7 @@ int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info,
   start_records= share->state.state.records;
   if (!(param->testflag & T_SILENT))
   {
-    printf("- recovering (with sort) MARIA-table '%s'\n",name);
+    printf("- recovering (with sort) Aria-table '%s'\n",name);
     printf("Data records: %s\n", llstr(start_records,llbuff));
   }
 
@@ -4091,7 +4091,7 @@ int maria_repair_parallel(HA_CHECK *param, register MARIA_HA *info,
   start_records= share->state.state.records;
   if (!(param->testflag & T_SILENT))
   {
-    printf("- parallel recovering (with sort) MARIA-table '%s'\n",name);
+    printf("- parallel recovering (with sort) Aria-table '%s'\n",name);
     printf("Data records: %s\n", llstr(start_records, llbuff));
   }
 
@@ -5683,7 +5683,7 @@ static int sort_delete_record(MARIA_SORT_PARAM *sort_param)
     _ma_check_print_error(param,
                           "Recover aborted; Can't run standard recovery on "
                           "compressed tables with errors in data-file. "
-                          "Use 'maria_chk --safe-recover' to fix it");
+                          "Use 'aria_chk --safe-recover' to fix it");
     DBUG_RETURN(1);
   }
 
@@ -6125,7 +6125,7 @@ void _ma_update_auto_increment_key(HA_CHECK *param, MARIA_HA *info,
   }
   if (!(param->testflag & T_SILENT) &&
       !(param->testflag & T_REP))
-    printf("Updating MARIA file: %s\n", param->isam_file_name);
+    printf("Updating Aria file: %s\n", param->isam_file_name);
   /*
     We have to use an allocated buffer instead of info->rec_buff as
     _ma_put_key_in_record() may use info->rec_buff
@@ -6766,7 +6766,7 @@ static void _ma_check_print_not_visible_error(HA_CHECK *param, TrID used_trid)
     {
       _ma_check_print_warning(param,
                               "Found row with transaction id %s but no "
-                              "maria_control_file was used or specified.  "
+                              "aria_control_file was used or specified.  "
                               "The table may be corrupted",
                               llstr(used_trid, buff));
     }
@@ -6774,7 +6774,7 @@ static void _ma_check_print_not_visible_error(HA_CHECK *param, TrID used_trid)
     {
       _ma_check_print_error(param,
                             "Found row with transaction id %s when max "
-                            "transaction id according to maria_control_file "
+                            "transaction id according to aria_control_file "
                             "is %s",
                             llstr(used_trid, buff),
                             llstr(param->max_trid, buff2));

storage/maria/ma_check_standalone.h

@@ -64,7 +64,7 @@ void _ma_check_print_warning(HA_CHECK *param, const char *fmt,...)
   if (!param->warning_printed && !param->error_printed)
   {
     if (param->testflag & T_SILENT)
-      fprintf(stderr,"%s: MARIA file %s\n",my_progname_short,
+      fprintf(stderr,"%s: Aria file %s\n",my_progname_short,
 	      param->isam_file_name);
     param->out_flag|= O_DATA_LOST;
   }
@@ -90,7 +90,7 @@ void _ma_check_print_error(HA_CHECK *param, const char *fmt,...)
   if (!param->warning_printed && !param->error_printed)
   {
     if (param->testflag & T_SILENT)
-      fprintf(stderr,"%s: MARIA file %s\n",my_progname_short,param->isam_file_name);
+      fprintf(stderr,"%s: Aria file %s\n",my_progname_short,param->isam_file_name);
     param->out_flag|= O_DATA_LOST;
   }
   param->error_printed|=1;