diff options
122 files changed, 2619 insertions, 2616 deletions
diff --git a/.bzrignore b/.bzrignore index dd569894167..d450bb9594a 100644 --- a/.bzrignore +++ b/.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/maria_chk -storage/maria/maria_control -storage/maria/maria_dump_log -storage/maria/maria_ftdump -storage/maria/maria_log -storage/maria/maria_log.* -storage/maria/maria_pack -storage/maria/maria_read_log +storage/maria/aria.log +storage/maria/aria_chk +storage/maria/aria_control +storage/maria/aria_dump_log +storage/maria/aria_ftdump +storage/maria/aria_log +storage/maria/aria_log.* +storage/maria/aria_pack +storage/maria/aria_read_log storage/maria/tmp storage/maria/tmp/* storage/maria/unittest/ma_pagecache_consist_1k-t-big diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 7f3784143a5..2028db94eed 100755 --- a/BUILD/SETUP.sh +++ b/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" diff --git a/CMakeLists.txt b/CMakeLists.txt index a94dcd8817c..5aa865d600f 100755 --- a/CMakeLists.txt +++ b/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 -IF(WITH_MARIA_STORAGE_ENGINE) - ADD_DEFINITIONS(-DWITH_MARIA_STORAGE_ENGINE) +# Special handling for tmp tables with the Aria engine +IF(WITH_ARIA_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 diff --git a/mysql-test/include/have_maria.inc b/mysql-test/include/have_maria.inc index 474e9db12b9..82725beb1e0 100644 --- a/mysql-test/include/have_maria.inc +++ b/mysql-test/include/have_maria.inc @@ -1,4 +1,5 @@ -disable_query_log; ---require r/true.require -select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'maria'; -enable_query_log; +if (!`SELECT count(*) FROM information_schema.engines WHERE + (support = 'YES' OR support = 'DEFAULT') AND + engine = 'aria'`){ + skip Need Aria engine; +} diff --git a/mysql-test/include/maria_empty_logs.inc b/mysql-test/include/maria_empty_logs.inc index cc93e214348..05ecfc4982c 100644 --- a/mysql-test/include/maria_empty_logs.inc +++ b/mysql-test/include/maria_empty_logs.inc @@ -27,52 +27,52 @@ EOF if (!$mel_keep_control_file) { --error 0,1 - remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control; + remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control; } -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000001; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000001; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000002; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000002; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000003; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000003; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000004; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000004; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000005; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000005; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000006; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000006; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000007; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000007; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000008; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000008; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000009; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000009; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000010; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000010; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000011; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000011; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000012; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000012; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000013; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000013; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000014; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000014; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000015; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000015; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000016; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000016; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000017; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000017; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000018; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000018; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000019; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000019; -- error 0,1 -remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000020; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000020; # hope there are not more than these logs... -- error 0,1 -remove_file $MYSQLD_DATADIR/maria_recovery.trace; +remove_file $MYSQLD_DATADIR/aria_recovery.trace; append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; restart-maria_empty_logs.inc diff --git a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc index 62f5250cab4..6111dacc8f3 100644 --- a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc +++ b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc @@ -32,7 +32,7 @@ let $mms_copy=0; let $MYSQLD_DATADIR= `SELECT @@datadir`; -- error 0,1 -remove_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.maria_log_control; -copy_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.maria_log_control; +remove_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.aria_log_control; +copy_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.aria_log_control; connection default; diff --git a/mysql-test/include/maria_verify_recovery.inc b/mysql-test/include/maria_verify_recovery.inc index e8354c43837..71292947c80 100644 --- a/mysql-test/include/maria_verify_recovery.inc +++ b/mysql-test/include/maria_verify_recovery.inc @@ -56,8 +56,8 @@ if ($mvr_restore_old_snapshot) # also copy back control file, to force recovery to start from an early # point, ignoring further checkpoints. -- error 0,1 - remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control; - copy_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.maria_log_control $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control; + remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control; + copy_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.aria_log_control $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control; } --echo * recovery happens diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index 2b242954ce9..622bbca3946 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/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( - vs_config_dirs('storage/maria', 'maria_chk'), - vs_config_dirs('maria', 'maria_chk'), - "$path_client_bindir/maria_chk", - "$glob_basedir/storage/maria/maria_chk", - "$glob_basedir/maria/maria_chk")); - $ENV{'MARIA_PACK'}= mtr_native_path(mtr_exe_maybe_exists( - vs_config_dirs('storage/maria', 'maria_pack'), - vs_config_dirs('maria', 'maria_pack'), - "$path_client_bindir/maria_pack", - "$glob_basedir/storage/maria/maria_pack", - "$glob_basedir/maria/maria_pack")); + $ENV{'ARIA_CHK'}= mtr_native_path(mtr_exe_maybe_exists( + vs_config_dirs('storage/maria', 'aria_chk'), + vs_config_dirs('maria', 'aria_chk'), + "$path_client_bindir/aria_chk", + "$glob_basedir/storage/maria/aria_chk", + "$glob_basedir/maria/aria_chk")); + $ENV{'ARIA_PACK'}= mtr_native_path(mtr_exe_maybe_exists( + vs_config_dirs('storage/maria', 'aria_pack'), + vs_config_dirs('maria', 'aria_pack'), + "$path_client_bindir/aria_pack", + "$glob_basedir/storage/maria/aria_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 ) { diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 3279c9a0089..994f6c077ff 100755 --- a/mysql-test/mysql-test-run.pl +++ b/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_PACK'}= tool_arguments("storage/maria", "maria_pack"); + $ENV{'MARIA_CHK'}= tool_arguments("storage/maria", "aria_chk"); + $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> diff --git a/mysql-test/suite/funcs_1/datadict/is_routines.inc b/mysql-test/suite/funcs_1/datadict/is_routines.inc index e6405c8d455..cc0cbdf62fe 100644 --- a/mysql-test/suite/funcs_1/datadict/is_routines.inc +++ b/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; diff --git a/mysql-test/suite/funcs_1/datadict/is_triggers.inc b/mysql-test/suite/funcs_1/datadict/is_triggers.inc index df3e6e7d2b6..5597bc816fc 100644 --- a/mysql-test/suite/funcs_1/datadict/is_triggers.inc +++ b/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; diff --git a/mysql-test/suite/funcs_1/datadict/is_views.inc b/mysql-test/suite/funcs_1/datadict/is_views.inc index b04904c2eba..0ba1aaff3f2 100644 --- a/mysql-test/suite/funcs_1/datadict/is_views.inc +++ b/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; diff --git a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc index 1fffdf014e6..544560ec526 100644 --- a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc +++ b/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; diff --git a/mysql-test/suite/funcs_1/datadict/processlist_val.inc b/mysql-test/suite/funcs_1/datadict/processlist_val.inc index a2ab02c963f..b1c1130cbdf 100644 --- a/mysql-test/suite/funcs_1/datadict/processlist_val.inc +++ b/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 diff --git a/mysql-test/suite/funcs_1/datadict/tables2.inc b/mysql-test/suite/funcs_1/datadict/tables2.inc index f9bb296eeaa..0d110dd22d9 100644 --- a/mysql-test/suite/funcs_1/datadict/tables2.inc +++ b/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 *, diff --git a/mysql-test/suite/funcs_1/t/is_columns.test b/mysql-test/suite/funcs_1/t/is_columns.test index 5e754c56532..fca21034e37 100644 --- a/mysql-test/suite/funcs_1/t/is_columns.test +++ b/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; diff --git a/mysql-test/suite/funcs_1/t/is_events.test b/mysql-test/suite/funcs_1/t/is_events.test index 22565840728..400094966b1 100644 --- a/mysql-test/suite/funcs_1/t/is_events.test +++ b/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; diff --git a/mysql-test/suite/maria/r/group_commit.result b/mysql-test/suite/maria/r/group_commit.result index 75d7318340a..4fb85b912ec 100644 --- a/mysql-test/suite/maria/r/group_commit.result +++ b/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 maria_group_commit_interval= 0; -SET GLOBAL maria_group_commit="NONE"; -SET GLOBAL maria_group_commit_interval= 100; -SET GLOBAL maria_group_commit="HARD"; -SET GLOBAL maria_group_commit_interval= 0; -SET GLOBAL maria_group_commit="HARD"; -SET GLOBAL maria_group_commit_interval= 100; -SET GLOBAL maria_group_commit="SOFT"; -SET GLOBAL maria_group_commit_interval= 0; -SET GLOBAL maria_group_commit="SOFT"; -SET GLOBAL maria_group_commit_interval= 100; -SET GLOBAL maria_group_commit="NONE"; -SET GLOBAL maria_group_commit_interval= 0; +SET GLOBAL aria_group_commit="NONE"; +SET GLOBAL aria_group_commit_interval= 0; +SET GLOBAL aria_group_commit="NONE"; +SET GLOBAL aria_group_commit_interval= 100; +SET GLOBAL aria_group_commit="HARD"; +SET GLOBAL aria_group_commit_interval= 0; +SET GLOBAL aria_group_commit="HARD"; +SET GLOBAL aria_group_commit_interval= 100; +SET GLOBAL aria_group_commit="SOFT"; +SET GLOBAL aria_group_commit_interval= 0; +SET GLOBAL aria_group_commit="SOFT"; +SET GLOBAL aria_group_commit_interval= 100; +SET GLOBAL aria_group_commit="NONE"; +SET GLOBAL aria_group_commit_interval= 0; drop table t1; diff --git a/mysql-test/suite/maria/r/maria-autozerofill.result b/mysql-test/suite/maria/r/maria-autozerofill.result index 0b069cd7a52..5638af70c5c 100644 --- a/mysql-test/suite/maria/r/maria-autozerofill.result +++ b/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 diff --git a/mysql-test/suite/maria/r/maria-big.result b/mysql-test/suite/maria/r/maria-big.result index 64b3296b6b2..cb6e02df00e 100644 --- a/mysql-test/suite/maria/r/maria-big.result +++ b/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 diff --git a/mysql-test/suite/maria/r/maria-big2.result b/mysql-test/suite/maria/r/maria-big2.result index 7fc57d6a203..3e4c6973997 100644 --- a/mysql-test/suite/maria/r/maria-big2.result +++ b/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 diff --git a/mysql-test/suite/maria/r/maria-connect.result b/mysql-test/suite/maria/r/maria-connect.result index 8fe483c8467..a02c29f3d5f 100644 --- a/mysql-test/suite/maria/r/maria-connect.result +++ b/mysql-test/suite/maria/r/maria-connect.result @@ -1,5 +1,5 @@ -set global storage_engine=maria; -set session storage_engine=maria; +set global storage_engine=aria; +set session storage_engine=aria; drop table if exists t1; SET SQL_WARNINGS=1; RESET MASTER; diff --git a/mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result b/mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result index 189872e8e13..743f1785f5c 100644 --- a/mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result +++ b/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 diff --git a/mysql-test/suite/maria/r/maria-gis-rtree-trans.result b/mysql-test/suite/maria/r/maria-gis-rtree-trans.result index 9e43daa9623..ae37b9d454d 100644 --- a/mysql-test/suite/maria/r/maria-gis-rtree-trans.result +++ b/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 diff --git a/mysql-test/suite/maria/r/maria-gis-rtree.result b/mysql-test/suite/maria/r/maria-gis-rtree.result index 0c929fe1313..a61e93d2a3a 100644 --- a/mysql-test/suite/maria/r/maria-gis-rtree.result +++ b/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 diff --git a/mysql-test/suite/maria/r/maria-mvcc.result b/mysql-test/suite/maria/r/maria-mvcc.result index 3919dfc597e..671b1bbf53c 100644 --- a/mysql-test/suite/maria/r/maria-mvcc.result +++ b/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; diff --git a/mysql-test/suite/maria/r/maria-no-logging.result b/mysql-test/suite/maria/r/maria-no-logging.result index e72842ae71b..0d3d7804853 100644 --- a/mysql-test/suite/maria/r/maria-no-logging.result +++ b/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 -show engine maria logs; +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +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; -show engine maria logs; +create table t1 engine=aria transactional=1 select * from t2; +show engine aria logs; Type Name Status -MARIA Size 16384 maria_log.00000001 unknown +Aria Size 16384 aria_log.00000001 unknown drop database mysqltest; diff --git a/mysql-test/suite/maria/r/maria-page-checksum.result b/mysql-test/suite/maria/r/maria-page-checksum.result index 0319bd9e9ca..c4d1b71e33a 100644 --- a/mysql-test/suite/maria/r/maria-page-checksum.result +++ b/mysql-test/suite/maria/r/maria-page-checksum.result @@ -1,940 +1,940 @@ drop table if exists t1; -select @@global.maria_page_checksum; -@@global.maria_page_checksum +select @@global.aria_page_checksum; +@@global.aria_page_checksum 1 # iteration 1 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 2 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 3 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 4 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 5 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 6 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 7 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 8 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 9 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 10 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 11 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 12 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 13 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 14 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 15 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 16 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 17 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 18 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 19 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 20 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 21 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 22 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 23 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 24 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 25 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 26 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 27 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 28 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 29 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 30 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 31 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 32 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 33 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 34 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 35 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; 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 Page checksums are not used drop table t1; # iteration 36 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; 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 Page checksums are used drop table t1; # iteration 1 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; 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 Crashsafe: yes alter table t1 modify a bigint ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` bigint(20) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 Crashsafe: yes drop table t1; # iteration 2 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; 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 Crashsafe: yes 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; # iteration 3 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; 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 Crashsafe: yes alter table t1 transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; # iteration 4 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; 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 Crashsafe: yes -alter table t1 engine=maria ; +alter table t1 engine=aria ; 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 Crashsafe: yes drop table t1; # iteration 5 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; 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 Crashsafe: yes -alter table t1 engine=maria transactional=0 ; +alter table t1 engine=aria 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; # iteration 6 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; 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 Crashsafe: yes -alter table t1 engine=maria transactional=1 ; +alter table t1 engine=aria transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; # iteration 7 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no alter table t1 modify a bigint ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` bigint(20) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; # iteration 8 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; # iteration 9 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no alter table t1 transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; # iteration 10 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no -alter table t1 engine=maria ; +alter table t1 engine=aria ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; # iteration 11 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no -alter table t1 engine=maria transactional=0 ; +alter table t1 engine=aria 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; # iteration 12 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no -alter table t1 engine=maria transactional=1 ; +alter table t1 engine=aria transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; # iteration 13 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes alter table t1 modify a bigint ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` bigint(20) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; # iteration 14 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; # iteration 15 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes alter table t1 transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; # iteration 16 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes -alter table t1 engine=maria ; +alter table t1 engine=aria ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; # iteration 17 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes -alter table t1 engine=maria transactional=0 ; +alter table t1 engine=aria 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=1 TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=0 Crashsafe: no drop table t1; # iteration 18 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes -alter table t1 engine=maria transactional=1 ; +alter table t1 engine=aria transactional=1 ; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 Crashsafe: yes drop table t1; diff --git a/mysql-test/suite/maria/r/maria-partitioning.result b/mysql-test/suite/maria/r/maria-partitioning.result index ff3035e560e..840c7c0b3b4 100644 --- a/mysql-test/suite/maria/r/maria-partitioning.result +++ b/mysql-test/suite/maria/r/maria-partitioning.result @@ -1,11 +1,11 @@ -set global storage_engine=maria; -set session storage_engine=maria; +set global storage_engine=aria; +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 t1(a int primary key) engine=maria; +create table t2(a blob) engine=aria; +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 t1(a int primary key) engine= maria PARTITION BY HASH (a) PARTITIONS 2; +create table t2(a blob) engine= aria; +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 diff --git a/mysql-test/suite/maria/r/maria-preload.result b/mysql-test/suite/maria/r/maria-preload.result index b7c65ba8bb4..a693b6768ac 100644 --- a/mysql-test/suite/maria/r/maria-preload.result +++ b/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%"; diff --git a/mysql-test/suite/maria/r/maria-purge.result b/mysql-test/suite/maria/r/maria-purge.result index eb67bab8cde..263e3270d26 100644 --- a/mysql-test/suite/maria/r/maria-purge.result +++ b/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 session storage_engine=maria; -set global maria_log_file_size=4294967295; +set global storage_engine=aria; +set session storage_engine=aria; +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 maria_checkpoint_interval=30; -SHOW ENGINE maria logs; +set global aria_log_file_size=16777216; +set global aria_checkpoint_interval=30; +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; -SHOW ENGINE maria logs; +set global aria_checkpoint_interval=30; +SHOW ENGINE aria logs; Type Name Status -MARIA maria_log.00000004 in use -set global maria_log_file_size=16777216; -select @@global.maria_log_file_size; -@@global.maria_log_file_size +Aria aria_log.00000004 in use +set global aria_log_file_size=16777216; +select @@global.aria_log_file_size; +@@global.aria_log_file_size 16777216 -set global maria_checkpoint_interval=30; -SHOW ENGINE maria logs; +set global aria_checkpoint_interval=30; +SHOW ENGINE aria logs; Type Name Status -MARIA maria_log.00000004 in use -set global maria_log_file_size=8388608; -select @@global.maria_log_file_size; -@@global.maria_log_file_size +Aria aria_log.00000004 in use +set global aria_log_file_size=8388608; +select @@global.aria_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; -SHOW ENGINE maria logs; +set global aria_checkpoint_interval=30; +SHOW ENGINE aria logs; Type Name Status -MARIA maria_log.00000004 free -MARIA maria_log.00000005 free -MARIA maria_log.00000006 free -MARIA maria_log.00000007 free -MARIA maria_log.00000008 in use +Aria aria_log.00000004 free +Aria aria_log.00000005 free +Aria aria_log.00000006 free +Aria aria_log.00000007 free +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 -set global maria_log_file_size=16777216; -set global maria_log_purge_type=external; +Aria aria_log.00000008 in use +set global aria_log_file_size=16777216; +set global aria_log_purge_type=external; insert into t1 select * from t2; -set global maria_checkpoint_interval=30; -SHOW ENGINE maria logs; +set global aria_checkpoint_interval=30; +SHOW ENGINE aria logs; Type Name Status -MARIA maria_log.00000008 free -MARIA maria_log.00000009 in use +Aria aria_log.00000008 free +Aria aria_log.00000009 in use flush logs; -SHOW ENGINE maria logs; +SHOW ENGINE aria logs; Type Name Status -MARIA maria_log.00000008 free -MARIA maria_log.00000009 in use -set global maria_log_purge_type=immediate; +Aria aria_log.00000008 free +Aria aria_log.00000009 in use +set global aria_log_purge_type=immediate; insert into t1 select * from t2; -set global maria_checkpoint_interval=30; -SHOW ENGINE maria logs; +set global aria_checkpoint_interval=30; +SHOW ENGINE aria logs; Type Name Status -MARIA maria_log.00000011 in use +Aria aria_log.00000011 in use drop table t1, t2; diff --git a/mysql-test/suite/maria/r/maria-recover.result b/mysql-test/suite/maria/r/maria-recover.result index e9bfc019c81..5353a249f96 100644 --- a/mysql-test/suite/maria/r/maria-recover.result +++ b/mysql-test/suite/maria/r/maria-recover.result @@ -1,22 +1,22 @@ -select @@global.maria_recover; -@@global.maria_recover +select @@global.aria_recover; +@@global.aria_recover BACKUP -set global maria_recover=off; -select @@global.maria_recover; -@@global.maria_recover +set global aria_recover=off; +select @@global.aria_recover; +@@global.aria_recover OFF -set global maria_recover=default; -select @@global.maria_recover; -@@global.maria_recover +set global aria_recover=default; +select @@global.aria_recover; +@@global.aria_recover NORMAL -set global maria_recover=normal; -select @@global.maria_recover; -@@global.maria_recover +set global aria_recover=normal; +select @@global.aria_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; diff --git a/mysql-test/suite/maria/r/maria-recovery-big.result b/mysql-test/suite/maria/r/maria-recovery-big.result index ecc53de437e..b205265f0da 100644 --- a/mysql-test/suite/maria/r/maria-recovery-big.result +++ b/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 diff --git a/mysql-test/suite/maria/r/maria-recovery-bitmap.result b/mysql-test/suite/maria/r/maria-recovery-bitmap.result index 01255c2394f..884825d4792 100644 --- a/mysql-test/suite/maria/r/maria-recovery-bitmap.result +++ b/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; diff --git a/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result b/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result index b8b0daa0ad8..57a2927c749 100644 --- a/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result +++ b/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; diff --git a/mysql-test/suite/maria/r/maria-recovery.result b/mysql-test/suite/maria/r/maria-recovery.result index b0440489cd1..cfabbf10be9 100644 --- a/mysql-test/suite/maria/r/maria-recovery.result +++ b/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; diff --git a/mysql-test/suite/maria/r/maria-recovery2.result b/mysql-test/suite/maria/r/maria-recovery2.result index bca6d0d7c74..b78d7dcc4e7 100644 --- a/mysql-test/suite/maria/r/maria-recovery2.result +++ b/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("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with maria_chk -r"); -set global maria_log_file_size=4294967295; +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 aria_chk -r"); +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; -create table t1(a int, b varchar(10), index(a,b)) engine=maria; +set global aria_checkpoint_interval=10000; +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 -set global maria_checkpoint_interval=10000; +Aria_pagecache_blocks_not_flushed 3 +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 diff --git a/mysql-test/suite/maria/r/maria-recovery3.result b/mysql-test/suite/maria/r/maria-recovery3.result index 118ec537901..4ce52425204 100644 --- a/mysql-test/suite/maria/r/maria-recovery3.result +++ b/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; diff --git a/mysql-test/suite/maria/r/maria.result b/mysql-test/suite/maria/r/maria.result index a56ae6ac401..e7f40ca10ed 100644 --- a/mysql-test/suite/maria/r/maria.result +++ b/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 -set global storage_engine=maria; -set session storage_engine=maria; -set global maria_page_checksum=0; -set global maria_log_file_size=4294967295; +Aria YES Crash-safe tables with MyISAM heritage YES NO NO +set global storage_engine=aria; +set session storage_engine=aria; +set global aria_page_checksum=0; +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; -show variables like 'maria_stats_method'; +set aria_stats_method=nulls_equal; +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; -show variables like 'maria_stats_method'; +set aria_stats_method=DEFAULT; +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; -show variables like 'maria_stats_method'; +set aria_stats_method=nulls_ignored; +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; -SHOW VARIABLES LIKE 'maria_repair%'; +SET @@aria_repair_threads=2; +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; -SHOW VARIABLES LIKE 'maria_repair%'; +SET @@aria_repair_threads=1; +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; -MARIA file: MYSQLD_DATADIR/test/t1 +) ENGINE=aria DEFAULT CHARSET=utf8 PACK_KEYS=0; +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 t2 (f3 int, f4 int) engine=maria; +create table t1 (f1 int unique, f2 int) engine=aria; +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 ) ; diff --git a/mysql-test/suite/maria/r/maria2.result b/mysql-test/suite/maria/r/maria2.result index e721ceaafae..f145a4884e7 100644 --- a/mysql-test/suite/maria/r/maria2.result +++ b/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 t2 (j int) engine=maria; +create table t1 (i int) engine=aria; +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; diff --git a/mysql-test/suite/maria/r/maria3.result b/mysql-test/suite/maria/r/maria3.result index 80b394cc417..2311669640b 100644 --- a/mysql-test/suite/maria/r/maria3.result +++ b/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 -set global storage_engine=maria; -set session storage_engine=maria; -set global maria_page_checksum=0; -set global maria_log_file_size=4294967295; +Aria YES Crash-safe tables with MyISAM heritage YES NO NO +set global storage_engine=aria; +set session storage_engine=aria; +set global aria_page_checksum=0; +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 -maria_checkpoint_interval 30 -maria_force_start_after_recovery_failures 0 -maria_group_commit none -maria_group_commit_interval 0 -maria_log_file_size 4294959104 -maria_log_purge_type immediate -maria_max_sort_file_size 9223372036853727232 -maria_pagecache_age_threshold 300 -maria_pagecache_buffer_size 134213632 -maria_pagecache_division_limit 100 -maria_page_checksum OFF -maria_recover NORMAL -maria_repair_threads 1 -maria_sort_buffer_size 134217728 -maria_stats_method nulls_unequal -maria_sync_log_dir NEWFILE -show status like 'maria%'; +aria_block_size 8192 +aria_checkpoint_interval 30 +aria_force_start_after_recovery_failures 0 +aria_group_commit none +aria_group_commit_interval 0 +aria_log_file_size 4294959104 +aria_log_purge_type immediate +aria_max_sort_file_size 9223372036853727232 +aria_pagecache_age_threshold 300 +aria_pagecache_buffer_size 134213632 +aria_pagecache_division_limit 100 +aria_page_checksum OFF +aria_recover NORMAL +aria_repair_threads 1 +aria_sort_buffer_size 134217728 +aria_stats_method nulls_unequal +aria_sync_log_dir NEWFILE +show status like 'aria%'; Variable_name Value -Maria_pagecache_blocks_not_flushed # -Maria_pagecache_blocks_unused # -Maria_pagecache_blocks_used # -Maria_pagecache_read_requests # -Maria_pagecache_reads # -Maria_pagecache_write_requests # -Maria_pagecache_writes # -Maria_transaction_log_syncs # +Aria_pagecache_blocks_not_flushed # +Aria_pagecache_blocks_unused # +Aria_pagecache_blocks_used # +Aria_pagecache_read_requests # +Aria_pagecache_reads # +Aria_pagecache_write_requests # +Aria_pagecache_writes # +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' diff --git a/mysql-test/suite/maria/r/maria_notembedded.result b/mysql-test/suite/maria/r/maria_notembedded.result index 77325d24421..f9d8bbfedc8 100644 --- a/mysql-test/suite/maria/r/maria_notembedded.result +++ b/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' diff --git a/mysql-test/suite/maria/r/maria_partition.result b/mysql-test/suite/maria/r/maria_partition.result index e501af7ec4a..372230c0b71 100644 --- a/mysql-test/suite/maria/r/maria_partition.result +++ b/mysql-test/suite/maria/r/maria_partition.result @@ -1,6 +1,6 @@ -set global storage_engine=maria; -set session storage_engine=maria; -set global maria_page_checksum=0; +set global storage_engine=aria; +set session storage_engine=aria; +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 t1(a int primary key) engine=maria; +create table t2(a blob) engine=aria; +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 diff --git a/mysql-test/suite/maria/r/maria_showlog_error.result b/mysql-test/suite/maria/r/maria_showlog_error.result index b27b4a5b21c..e2434efec28 100644 --- a/mysql-test/suite/maria/r/maria_showlog_error.result +++ b/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 diff --git a/mysql-test/suite/maria/r/ps_maria.result b/mysql-test/suite/maria/r/ps_maria.result index e2dcfc68d46..30f7edb8a99 100644 --- a/mysql-test/suite/maria/r/ps_maria.result +++ b/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 ; diff --git a/mysql-test/suite/maria/t/group_commit.test b/mysql-test/suite/maria/t/group_commit.test index e2cace14036..38b2c9d3bf4 100644 --- a/mysql-test/suite/maria/t/group_commit.test +++ b/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 maria_group_commit_interval= 0; +SET GLOBAL aria_group_commit="NONE"; +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 maria_group_commit_interval= 100; +SET GLOBAL aria_group_commit="NONE"; +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 maria_group_commit_interval= 0; +SET GLOBAL aria_group_commit="HARD"; +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 maria_group_commit_interval= 100; +SET GLOBAL aria_group_commit="HARD"; +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 maria_group_commit_interval= 0; +SET GLOBAL aria_group_commit="SOFT"; +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 maria_group_commit_interval= 100; +SET GLOBAL aria_group_commit="SOFT"; +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 maria_group_commit_interval= 0; +SET GLOBAL aria_group_commit="NONE"; +SET GLOBAL aria_group_commit_interval= 0; drop table t1; diff --git a/mysql-test/suite/maria/t/maria-autozerofill.test b/mysql-test/suite/maria/t/maria-autozerofill.test index 45eb39fbc21..2f47d13ba50 100644 --- a/mysql-test/suite/maria/t/maria-autozerofill.test +++ b/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); diff --git a/mysql-test/suite/maria/t/maria-big.test b/mysql-test/suite/maria/t/maria-big.test index 612cdbabb81..5b4b6c4defe 100644 --- a/mysql-test/suite/maria/t/maria-big.test +++ b/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 diff --git a/mysql-test/suite/maria/t/maria-big2.test b/mysql-test/suite/maria/t/maria-big2.test index 867ce71d4b5..d138892fe3c 100644 --- a/mysql-test/suite/maria/t/maria-big2.test +++ b/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') diff --git a/mysql-test/suite/maria/t/maria-connect.test b/mysql-test/suite/maria/t/maria-connect.test index 31b15b1f8f1..9efb5844bc2 100644 --- a/mysql-test/suite/maria/t/maria-connect.test +++ b/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 session storage_engine=maria; +set global storage_engine=aria; +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 diff --git a/mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test b/mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test index 228998c01c3..166c88cab36 100644 --- a/mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test +++ b/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) diff --git a/mysql-test/suite/maria/t/maria-gis-rtree-trans.test b/mysql-test/suite/maria/t/maria-gis-rtree-trans.test index f530699c755..ec1573c3e29 100644 --- a/mysql-test/suite/maria/t/maria-gis-rtree-trans.test +++ b/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) diff --git a/mysql-test/suite/maria/t/maria-gis-rtree.test b/mysql-test/suite/maria/t/maria-gis-rtree.test index 7a3e5634388..beffbfc99fe 100644 --- a/mysql-test/suite/maria/t/maria-gis-rtree.test +++ b/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) diff --git a/mysql-test/suite/maria/t/maria-mvcc.test b/mysql-test/suite/maria/t/maria-mvcc.test index 4b6f8a3996d..8be8e2ea630 100644 --- a/mysql-test/suite/maria/t/maria-mvcc.test +++ b/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)')); diff --git a/mysql-test/suite/maria/t/maria-no-logging.test b/mysql-test/suite/maria/t/maria-no-logging.test index bca99848250..f0533686588 100644 --- a/mysql-test/suite/maria/t/maria-no-logging.test +++ b/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`; -set global maria_checkpoint_interval=0; +let $def_checkinterval=`select @@global.aria_checkpoint_interval`; +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/ -show engine maria logs; +--replace_regex /; .+aria_log/aria_log/ +show engine aria logs; insert into t1 values('a'); insert into t1 select * from t2; ---replace_regex /; .+maria_log/maria_log/ -show engine maria logs; +--replace_regex /; .+aria_log/aria_log/ +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/ -show engine maria logs; +--replace_regex /; .+aria_log/aria_log/ +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/ -show engine maria logs; +--replace_regex /; .+aria_log/aria_log/ +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; ---replace_regex /; .+maria_log/maria_log/ -show engine maria logs; +create table t1 engine=aria transactional=1 select * from t2; +--replace_regex /; .+aria_log/aria_log/ +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 diff --git a/mysql-test/suite/maria/t/maria-page-checksum.test b/mysql-test/suite/maria/t/maria-page-checksum.test index 9b05b00a371..8dd68fce245 100644 --- a/mysql-test/suite/maria/t/maria-page-checksum.test +++ b/mysql-test/suite/maria/t/maria-page-checksum.test @@ -1,4 +1,4 @@ -# Tests for two bugs related to ALTER TABLE and maria-specific alter +# Tests for two bugs related to ALTER TABLE and aria-specific alter # options (PAGE_CHECKSUM and TRANSACTIONAL). -- source include/have_maria.inc @@ -13,34 +13,34 @@ drop table if exists t1; let $MYSQLD_DATADIR= `select @@datadir`; -select @@global.maria_page_checksum; +select @@global.aria_page_checksum; # we scan through combinations in the cartesian product of -# (first value of maria_page_checksum) x (clauses in CREATE TABLE) x -# (second value of maria_page_checksum) x (clauses in ALTER TABLE). +# (first value of aria_page_checksum) x (clauses in CREATE TABLE) x +# (second value of aria_page_checksum) x (clauses in ALTER TABLE). --echo # iteration 1 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -49,27 +49,27 @@ EOF drop table t1; --echo # iteration 2 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -78,27 +78,27 @@ EOF drop table t1; --echo # iteration 3 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -107,27 +107,27 @@ EOF drop table t1; --echo # iteration 4 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -136,27 +136,27 @@ EOF drop table t1; --echo # iteration 5 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -165,27 +165,27 @@ EOF drop table t1; --echo # iteration 6 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -194,27 +194,27 @@ EOF drop table t1; --echo # iteration 7 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -223,27 +223,27 @@ EOF drop table t1; --echo # iteration 8 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -252,27 +252,27 @@ EOF drop table t1; --echo # iteration 9 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -281,27 +281,27 @@ EOF drop table t1; --echo # iteration 10 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -310,27 +310,27 @@ EOF drop table t1; --echo # iteration 11 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -339,27 +339,27 @@ EOF drop table t1; --echo # iteration 12 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -368,27 +368,27 @@ EOF drop table t1; --echo # iteration 13 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -397,27 +397,27 @@ EOF drop table t1; --echo # iteration 14 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -426,27 +426,27 @@ EOF drop table t1; --echo # iteration 15 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -455,27 +455,27 @@ EOF drop table t1; --echo # iteration 16 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -484,27 +484,27 @@ EOF drop table t1; --echo # iteration 17 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -513,27 +513,27 @@ EOF drop table t1; --echo # iteration 18 -set global maria_page_checksum = 0 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 0 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -542,27 +542,27 @@ EOF drop table t1; --echo # iteration 19 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -571,27 +571,27 @@ EOF drop table t1; --echo # iteration 20 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -600,27 +600,27 @@ EOF drop table t1; --echo # iteration 21 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -629,27 +629,27 @@ EOF drop table t1; --echo # iteration 22 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -658,27 +658,27 @@ EOF drop table t1; --echo # iteration 23 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -687,27 +687,27 @@ EOF drop table t1; --echo # iteration 24 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -716,27 +716,27 @@ EOF drop table t1; --echo # iteration 25 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -745,27 +745,27 @@ EOF drop table t1; --echo # iteration 26 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -774,27 +774,27 @@ EOF drop table t1; --echo # iteration 27 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -803,27 +803,27 @@ EOF drop table t1; --echo # iteration 28 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -832,27 +832,27 @@ EOF drop table t1; --echo # iteration 29 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -861,27 +861,27 @@ EOF drop table t1; --echo # iteration 30 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=0 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -890,27 +890,27 @@ EOF drop table t1; --echo # iteration 31 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 0 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -919,27 +919,27 @@ EOF drop table t1; --echo # iteration 32 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -948,27 +948,27 @@ EOF drop table t1; --echo # iteration 33 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 0 ; +set global aria_page_checksum = 0 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -977,27 +977,27 @@ EOF drop table t1; --echo # iteration 34 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; -alter table t1 engine=maria ; +set global aria_page_checksum = 1 ; +alter table t1 engine=aria ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -1006,27 +1006,27 @@ EOF drop table t1; --echo # iteration 35 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=0 ; show create table t1 /* expecting PAGE_CHECKSUM=0 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -1035,27 +1035,27 @@ EOF drop table t1; --echo # iteration 36 -set global maria_page_checksum = 1 ; -create table t1(a int) engine=maria PAGE_CHECKSUM=1 ; +set global aria_page_checksum = 1 ; +create table t1(a int) engine=aria PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; close FILE; EOF -set global maria_page_checksum = 1 ; +set global aria_page_checksum = 1 ; alter table t1 PAGE_CHECKSUM=1 ; show create table t1 /* expecting PAGE_CHECKSUM=1 */ ; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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= grep(/Page checksums are used/, <FILE>); print @content ? $content[0] : "Page checksums are not used\n"; @@ -1065,20 +1065,20 @@ drop table t1; # # Test for BUG#37005 -# "Maria: ALTER TABLE TRANSACTIONAL=0 leaves table transactional inside Maria" +# "Aria: ALTER TABLE TRANSACTIONAL=0 leaves table transactional inside Aria" # # we scan through combinations in the cartesian product of # (clauses in CREATE TABLE) x (clauses in ALTER TABLE). --echo # iteration 1 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1086,11 +1086,11 @@ EOF alter table t1 modify a bigint ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1099,13 +1099,13 @@ drop table t1; --echo # iteration 2 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1113,11 +1113,11 @@ EOF alter table t1 transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1126,13 +1126,13 @@ drop table t1; --echo # iteration 3 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1140,11 +1140,11 @@ EOF alter table t1 transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1153,25 +1153,25 @@ drop table t1; --echo # iteration 4 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; EOF -alter table t1 engine=maria ; +alter table t1 engine=aria ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1180,25 +1180,25 @@ drop table t1; --echo # iteration 5 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; EOF -alter table t1 engine=maria transactional=0 ; +alter table t1 engine=aria transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1207,25 +1207,25 @@ drop table t1; --echo # iteration 6 -create table t1(a int) engine=maria ; +create table t1(a int) engine=aria ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; EOF -alter table t1 engine=maria transactional=1 ; +alter table t1 engine=aria transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1234,13 +1234,13 @@ drop table t1; --echo # iteration 7 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1248,11 +1248,11 @@ EOF alter table t1 modify a bigint ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1261,13 +1261,13 @@ drop table t1; --echo # iteration 8 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1275,11 +1275,11 @@ EOF alter table t1 transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1288,13 +1288,13 @@ drop table t1; --echo # iteration 9 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1302,11 +1302,11 @@ EOF alter table t1 transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1315,25 +1315,25 @@ drop table t1; --echo # iteration 10 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; EOF -alter table t1 engine=maria ; +alter table t1 engine=aria ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1342,25 +1342,25 @@ drop table t1; --echo # iteration 11 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; EOF -alter table t1 engine=maria transactional=0 ; +alter table t1 engine=aria transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1369,25 +1369,25 @@ drop table t1; --echo # iteration 12 -create table t1(a int) engine=maria transactional=0 ; +create table t1(a int) engine=aria transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; EOF -alter table t1 engine=maria transactional=1 ; +alter table t1 engine=aria transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1396,13 +1396,13 @@ drop table t1; --echo # iteration 13 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1410,11 +1410,11 @@ EOF alter table t1 modify a bigint ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1423,13 +1423,13 @@ drop table t1; --echo # iteration 14 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1437,11 +1437,11 @@ EOF alter table t1 transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1450,13 +1450,13 @@ drop table t1; --echo # iteration 15 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1464,11 +1464,11 @@ EOF alter table t1 transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1477,25 +1477,25 @@ drop table t1; --echo # iteration 16 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; EOF -alter table t1 engine=maria ; +alter table t1 engine=aria ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1504,25 +1504,25 @@ drop table t1; --echo # iteration 17 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; EOF -alter table t1 engine=maria transactional=0 ; +alter table t1 engine=aria transactional=0 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; @@ -1531,25 +1531,25 @@ drop table t1; --echo # iteration 18 -create table t1(a int) engine=maria transactional=1 ; +create table t1(a int) engine=aria transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; EOF -alter table t1 engine=maria transactional=1 ; +alter table t1 engine=aria transactional=1 ; show create table t1; ---exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt +--exec $MARIA_CHK -dv $MYSQLD_DATADIR/test/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; print grep(/Crashsafe/, <FILE>); close FILE; diff --git a/mysql-test/suite/maria/t/maria-partitioning.test b/mysql-test/suite/maria/t/maria-partitioning.test index 589b489331d..612c44be57e 100644 --- a/mysql-test/suite/maria/t/maria-partitioning.test +++ b/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`; -set global storage_engine=maria; -set session storage_engine=maria; +let $default_checksum=`select @@global.aria_page_checksum`; +set global storage_engine=aria; +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 t1(a int primary key) engine=maria; +create table t2(a blob) engine=aria; +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 t1(a int primary key) engine= maria PARTITION BY HASH (a) PARTITIONS 2; +create table t2(a blob) engine= aria; +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); diff --git a/mysql-test/suite/maria/t/maria-preload.test b/mysql-test/suite/maria/t/maria-preload.test index 5012ca64f31..efac10ecbec 100644 --- a/mysql-test/suite/maria/t/maria-preload.test +++ b/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`; -set global maria_checkpoint_interval=0; +let $def_checkinterval=`select @@global.aria_checkpoint_interval`; +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 diff --git a/mysql-test/suite/maria/t/maria-purge.test b/mysql-test/suite/maria/t/maria-purge.test index 0aa720543f6..c38a58bc492 100644 --- a/mysql-test/suite/maria/t/maria-purge.test +++ b/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 session storage_engine=maria; -let $def_logsize=`select @@global.maria_log_file_size`; -let $def_checkinterval=`select @@global.maria_checkpoint_interval`; +set global storage_engine=aria; +set session storage_engine=aria; +let $def_logsize=`select @@global.aria_log_file_size`; +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; ---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/ -SHOW ENGINE maria logs; +eval set global aria_checkpoint_interval=$def_checkinterval; +--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/ +SHOW ENGINE aria logs; insert into t2 select * from t1; insert into t1 select * from t2; -eval set global maria_checkpoint_interval=$def_checkinterval; ---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/ -SHOW ENGINE maria logs; -set global maria_log_file_size=16777216; -select @@global.maria_log_file_size; -eval set global maria_checkpoint_interval=$def_checkinterval; ---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/ -SHOW ENGINE maria logs; -set global maria_log_file_size=8388608; -select @@global.maria_log_file_size; +eval set global aria_checkpoint_interval=$def_checkinterval; +--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/ +SHOW ENGINE aria logs; +set global aria_log_file_size=16777216; +select @@global.aria_log_file_size; +eval set global aria_checkpoint_interval=$def_checkinterval; +--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/ +SHOW ENGINE aria logs; +set global aria_log_file_size=8388608; +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; ---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/ -SHOW ENGINE maria logs; +eval set global aria_checkpoint_interval=$def_checkinterval; +--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/ +SHOW ENGINE aria logs; flush logs; ---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/ -SHOW ENGINE maria logs; +--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/ +SHOW ENGINE aria logs; -set global maria_log_file_size=16777216; -set global maria_log_purge_type=external; +set global aria_log_file_size=16777216; +set global aria_log_purge_type=external; insert into t1 select * from t2; -eval set global maria_checkpoint_interval=$def_checkinterval; ---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/ -SHOW ENGINE maria logs; +eval set global aria_checkpoint_interval=$def_checkinterval; +--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/ +SHOW ENGINE aria logs; flush logs; ---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/ -SHOW ENGINE maria logs; +--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/ +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; ---replace_regex /Size +[0-9]+ ; .+maria_log/maria_log/ -SHOW ENGINE maria logs; +eval set global aria_checkpoint_interval=$def_checkinterval; +--replace_regex /Size +[0-9]+ ; .+aria_log/aria_log/ +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 maria_checkpoint_interval=$def_checkinterval; +eval set global aria_log_file_size=$def_logsize; +eval set global aria_checkpoint_interval=$def_checkinterval; --enable_result_log --enable_query_log diff --git a/mysql-test/suite/maria/t/maria-recover-master.opt b/mysql-test/suite/maria/t/maria-recover-master.opt index 0cdefeadf3d..7582a381a32 100644 --- a/mysql-test/suite/maria/t/maria-recover-master.opt +++ b/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 diff --git a/mysql-test/suite/maria/t/maria-recover.test b/mysql-test/suite/maria/t/maria-recover.test index e9ae0933d4c..0fad13a297b 100644 --- a/mysql-test/suite/maria/t/maria-recover.test +++ b/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; -set global maria_recover=off; -select @@global.maria_recover; -set global maria_recover=default; -select @@global.maria_recover; -set global maria_recover=normal; -select @@global.maria_recover; +select @@global.aria_recover; +set global aria_recover=off; +select @@global.aria_recover; +set global aria_recover=default; +select @@global.aria_recover; +set global aria_recover=normal; +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; diff --git a/mysql-test/suite/maria/t/maria-recovery-big.test b/mysql-test/suite/maria/t/maria-recovery-big.test index 4de8f934ec1..7a9a56c67ea 100644 --- a/mysql-test/suite/maria/t/maria-recovery-big.test +++ b/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; diff --git a/mysql-test/suite/maria/t/maria-recovery-bitmap.test b/mysql-test/suite/maria/t/maria-recovery-bitmap.test index f6b6583e9df..856785a04a8 100644 --- a/mysql-test/suite/maria/t/maria-recovery-bitmap.test +++ b/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; diff --git a/mysql-test/suite/maria/t/maria-recovery-master.opt b/mysql-test/suite/maria/t/maria-recovery-master.opt index 9023fb74e8b..58d0d012c54 100644 --- a/mysql-test/suite/maria/t/maria-recovery-master.opt +++ b/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 diff --git a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test index 3ede5002b72..a943185d12f 100644 --- a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test +++ b/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). diff --git a/mysql-test/suite/maria/t/maria-recovery.test b/mysql-test/suite/maria/t/maria-recovery.test index 6ba8e65e658..6eb91c59dc1 100644 --- a/mysql-test/suite/maria/t/maria-recovery.test +++ b/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 diff --git a/mysql-test/suite/maria/t/maria-recovery2-master.opt b/mysql-test/suite/maria/t/maria-recovery2-master.opt index 36b4216a4b4..9b232472a24 100644 --- a/mysql-test/suite/maria/t/maria-recovery2-master.opt +++ b/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= diff --git a/mysql-test/suite/maria/t/maria-recovery2.test b/mysql-test/suite/maria/t/maria-recovery2.test index 017256a5ec8..81ea45fbd42 100644 --- a/mysql-test/suite/maria/t/maria-recovery2.test +++ b/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("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with maria_chk -r"); +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 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; -create table t1(a int) engine=maria; +let $mvr_crash_statement= set global aria_checkpoint_interval=1; +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; -create table t1(a int, b varchar(10), index(a,b)) engine=maria; +set global aria_checkpoint_interval=10000; +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 diff --git a/mysql-test/suite/maria/t/maria-recovery3-master.opt b/mysql-test/suite/maria/t/maria-recovery3-master.opt index 9023fb74e8b..58d0d012c54 100644 --- a/mysql-test/suite/maria/t/maria-recovery3-master.opt +++ b/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 diff --git a/mysql-test/suite/maria/t/maria-recovery3.test b/mysql-test/suite/maria/t/maria-recovery3.test index a241473f457..192361633ca 100644 --- a/mysql-test/suite/maria/t/maria-recovery3.test +++ b/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 diff --git a/mysql-test/suite/maria/t/maria.test b/mysql-test/suite/maria/t/maria.test index 664bcb372ca..ccbe2c99037 100644 --- a/mysql-test/suite/maria/t/maria.test +++ b/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`; -set global storage_engine=maria; -set session storage_engine=maria; -set global maria_page_checksum=0; -let $default_log_file_size=`select @@global.maria_log_file_size`; -set global maria_log_file_size=4294967295; +let $default_checksum=`select @@global.aria_page_checksum`; +set global storage_engine=aria; +set session storage_engine=aria; +set global aria_page_checksum=0; +let $default_log_file_size=`select @@global.aria_log_file_size`; +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; -show variables like 'maria_stats_method'; +set aria_stats_method=nulls_equal; +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; -show variables like 'maria_stats_method'; +set aria_stats_method=DEFAULT; +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 -set maria_stats_method=nulls_ignored; -show variables like 'maria_stats_method'; +# WL#2609, CSC#XXXX: ARIA +set aria_stats_method=nulls_ignored; +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; -SHOW VARIABLES LIKE 'maria_repair%'; +SET @@aria_repair_threads=2; +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; -SHOW VARIABLES LIKE 'maria_repair%'; +SET @@aria_repair_threads=1; +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 maria_chk -iev var/mysqld.1/data/test/t1 +#--exec aria_chk -dvv 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 t2 (f3 int, f4 int) engine=maria; +create table t1 (f1 int unique, f2 int) engine=aria; +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, -maria_log_file_size=$default_log_file_size; +aria_page_checksum=$default_checksum, +aria_log_file_size=$default_log_file_size; --enable_result_log --enable_query_log diff --git a/mysql-test/suite/maria/t/maria2.test b/mysql-test/suite/maria/t/maria2.test index 45155ab9cae..00bbea165ee 100644 --- a/mysql-test/suite/maria/t/maria2.test +++ b/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 t2 (j int) engine=maria; +create table t1 (i int) engine=aria; +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; diff --git a/mysql-test/suite/maria/t/maria3.test b/mysql-test/suite/maria/t/maria3.test index f2ae5d73fb2..55b5959a970 100644 --- a/mysql-test/suite/maria/t/maria3.test +++ b/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`; -set global storage_engine=maria; -set session storage_engine=maria; -set global maria_page_checksum=0; -let $default_log_file_size=`select @@global.maria_log_file_size`; -set global maria_log_file_size=4294967295; +let $default_checksum=`select @@global.aria_page_checksum`; +set global storage_engine=aria; +set session storage_engine=aria; +set global aria_page_checksum=0; +let $default_log_file_size=`select @@global.aria_log_file_size`; +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, -maria_log_file_size=$default_log_file_size; +aria_page_checksum=$default_checksum, +aria_log_file_size=$default_log_file_size; --enable_result_log --enable_query_log diff --git a/mysql-test/suite/maria/t/maria_notembedded.test b/mysql-test/suite/maria/t/maria_notembedded.test index 0f27802de27..f1d71e90354 100644 --- a/mysql-test/suite/maria/t/maria_notembedded.test +++ b/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) diff --git a/mysql-test/suite/maria/t/maria_partition.test b/mysql-test/suite/maria/t/maria_partition.test index ced87903c21..47571c7a4be 100644 --- a/mysql-test/suite/maria/t/maria_partition.test +++ b/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`; -set global storage_engine=maria; -set session storage_engine=maria; -set global maria_page_checksum=0; +let $default_checksum=`select @@global.aria_page_checksum`; +set global storage_engine=aria; +set session storage_engine=aria; +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 t1(a int primary key) engine=maria; +create table t2(a blob) engine=aria; +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; -set global maria_log_file_size=default; +eval set global storage_engine=$default_engine, aria_page_checksum=$default_checksum; +set global aria_log_file_size=default; --enable_result_log --enable_query_log diff --git a/mysql-test/suite/maria/t/maria_showlog_error.test b/mysql-test/suite/maria/t/maria_showlog_error.test index 9c4d5b8ef2c..d6c59c5a0a6 100644 --- a/mysql-test/suite/maria/t/maria_showlog_error.test +++ b/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; ---replace_regex /Size unknown ; .*maria_log.00000001/Size unknown ; maria_log.00000001/ -show engine maria logs; +remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000001; +--replace_regex /Size unknown ; .*aria_log.00000001/Size unknown ; aria_log.00000001/ +show engine aria logs; # cleunup after this test -- source include/maria_empty_logs.inc diff --git a/mysql-test/suite/maria/t/optimize.test b/mysql-test/suite/maria/t/optimize.test index 9f38a68edeb..fe87bc558cb 100644 --- a/mysql-test/suite/maria/t/optimize.test +++ b/mysql-test/suite/maria/t/optimize.test @@ -5,13 +5,13 @@ drop table if exists t1; --enable_warnings # -# Test for LP#603026: RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Maria table +# Test for LP#603026: RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Aria table # --disable_query_log set autocommit=1; --disable_warnings -CREATE TABLE t1 ( `col_varchar_1024_utf8_not_null_key` varchar(1024) CHARACTER SET utf8 not null, `col_varchar_1024_utf8_key` varchar(1024) CHARACTER SET utf8, `col_varchar_1024_utf8_not_null` varchar(1024) CHARACTER SET utf8 not null, `col_varchar_1024_utf8` varchar(1024) CHARACTER SET utf8, pk varchar(1024) not null, `col_varchar_1024_latin1` varchar(1024) CHARACTER SET latin1, `col_varchar_1024_latin1_not_null_key` varchar(1024) CHARACTER SET latin1 not null, `col_varchar_1024_latin1_not_null` varchar(1024) CHARACTER SET latin1 not null, `col_varchar_1024_latin1_key` varchar(1024) CHARACTER SET latin1, /*Indices*/ key (`col_varchar_1024_utf8_not_null_key` ), key (`col_varchar_1024_utf8_key` ), primary key (pk), key (`col_varchar_1024_latin1_not_null_key` ), key (`col_varchar_1024_latin1_key` )) ENGINE=maria; +CREATE TABLE t1 ( `col_varchar_1024_utf8_not_null_key` varchar(1024) CHARACTER SET utf8 not null, `col_varchar_1024_utf8_key` varchar(1024) CHARACTER SET utf8, `col_varchar_1024_utf8_not_null` varchar(1024) CHARACTER SET utf8 not null, `col_varchar_1024_utf8` varchar(1024) CHARACTER SET utf8, pk varchar(1024) not null, `col_varchar_1024_latin1` varchar(1024) CHARACTER SET latin1, `col_varchar_1024_latin1_not_null_key` varchar(1024) CHARACTER SET latin1 not null, `col_varchar_1024_latin1_not_null` varchar(1024) CHARACTER SET latin1 not null, `col_varchar_1024_latin1_key` varchar(1024) CHARACTER SET latin1, /*Indices*/ key (`col_varchar_1024_utf8_not_null_key` ), key (`col_varchar_1024_utf8_key` ), primary key (pk), key (`col_varchar_1024_latin1_not_null_key` ), key (`col_varchar_1024_latin1_key` )) ENGINE=aria; --enable_warnings INSERT /*! IGNORE */ INTO t1 VALUES ('dbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzb', 'wdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwby', 'something', 'pwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfa', 1, 'dpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjr', 'can', 'hdpwdbhfatqokbosjofmpdxvhq', 'rhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapnjnestutftmutidlvdubbjdznrxsrrmahxsxurpkqkedeznqccfidiazhmmasxemcshyvhqcxvmhqqvzowtbnjpxxw') , ('urhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxci', 'turhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapnjnestutftmutidl', 'to', 'rturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftka', 2, 'grturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmh', 'ygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapnjnestutftmutidlvdubbjdznrxsrrmahxsxurpkqkedeznqccfidiazhmmasxemcshyvh', 'rygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapnjnestutftmutidlvdubbjdznrxsrrmahxsxurpkqkedeznqccfidiazhmmasxemcshyvhqcxvmhqqvzowtbnjpxxwmabsoaiqscbnfwvhwdjgrhlfusfplamodraqbpgtdgviqngjtlykclmdokwpttsicss', 'vrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizw') , ('c', 'wvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbld', 'had', 'twvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxw', 3, 'htwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapnjnestutftmutidlvdubbjd', 'q', 'z', 'phtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfi') , ('vphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapn', 'jvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjv', 'ejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgq', 'vejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqyt', 4, 't', 'why', 'your', 'cvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxrey') , ('v', 'rcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambx', 'frcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilx', 'p', 5, 'kfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapnjnestutftmutidlvdubbjdznrxsrrmahxsxurpkqkedeznqccfidiazhmmasxemcshyvhqcxvmhqqvzowtbnjpxxwmabsoaiqscbnfwvhwdjgrhlfusfplamodr', 'i', 'ikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmy', 'jikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmu'); INSERT /*! IGNORE */ INTO t1 VALUES ('wjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcq', 'uwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnng', 'zuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajy', 'i', 6, 'u', 'q', 'd', 'izuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkq') , ('bizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapnjnestutftmutidlvdub', 'd', 'lbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapnjnestutftmutidlvdubbjdznrxsrrmahxsxurpkqkedeznqccfidiazhmmasxemcshyvhqcxvmhqqvzowtbnjpxxwmabsoaiqscbn', 'llbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfz', 7, 'bllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapnjnestutf', 'rbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmf', 'really', 'yrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnngh') , ('tyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwp', 'xtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmsw', 'kxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgkne', 'mkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjv', 8, 'zmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgx', 'ezmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapnjnestutftmutidlvdubbjdznrxsrrmahxsxurpkqkedeznqccfidiazhmmasxemcshyvhqcxvmhqqvzowtbnjpxxwmabsoaiqscbnfwvhwdjgrhlfusfplamodraqbpgtdgviqngjtlykclm', 'no', 'eezmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczs') , ('m', 'keezmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfep', 'tkeezmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqh', 'ztkeezmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveambxrovrpulkkjqccekfbfamsuiwhofodwrlsvwmxtvaoazfufeehwftkaugjsnebabzsscqhnafqodwrvohesokjrzhnkjhqowroirjsmofgfvfuomwlcdytimiwybmtuheejeitapnjnestutftmutidlvdubbjdznrxsrrmahxsxurpkqkedeznqccfidiazhmmasxemcshyvhqcxvmhqqvzowtbnjpxxwmabsoaiqscbnfwvhwdjgrhlf', 9, 'n', 'hey', 'hztkeezmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxw', 'shztkeezmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnroljslhdnjmdetcftzsrkjzmhimfmsbhnsgriqkaejakxzbldvftdcaugaahtcwtnujxmwqvkfepcswvrvqhibmuutnuhmvcnctfzmswcmtsrpmyedqxpoluufzbhwbrmcdiwytofotjitmaijfpfbpdwickgvibccphunilmnxvdsykirhgxvyehxyhixejfktoptnpveamb') , ('bshztkeezmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvf', 'on', 'look', 'I', 10, 'xbshztkeezmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxz', 'lxbshztkeezmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjr', 'what', 'ilxbshztkeezmkxtyrbllbizuwjikfrcvejvphtwvrygrturhdpwdbhfatqokbosjofmpdxvhqvfnyxowgqqxermmjkovqnoqhpubzfjxwqacdiwyekwemegyaluzytnccflbvqnqnmfvvlhitckzgppyilihmleccmmxqxcilxqvfikqseftdkgtlqzbwpucapktdeqxndcqytizhxaaiyashfuwbyynvenjcsmasklnxxtbzrqxmoupppjcctptgoksleizxkrbednzzwgvlnnghjvvtlpajyalhsygtjrhjxreywihgnxlevtsvfzsztftgvgzkqhwpnbztbcpoqdmhgjffokjvoaejwgqpnhemopbmrkfnkwngdjiawsiarcbkgoudqpkecymujxlwfzdeqnrumctcfmndgknecfzkndoohlpkgksukysorfgkvvkreijhlyhznczsxfdezymeqjpdeydhvhrxolrlxmxxdmajqwizwmyvustnzbrbopxmspxnazyxzmuysgonfckdeurqnrolj'); diff --git a/mysql-test/suite/maria/t/ps_maria.test b/mysql-test/suite/maria/t/ps_maria.test index 34960d90f8f..d3623314631 100644 --- a/mysql-test/suite/maria/t/ps_maria.test +++ b/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 diff --git a/mysql-test/suite/parts/r/partition_alter2_1_maria.result b/mysql-test/suite/parts/r/partition_alter2_1_maria.result index 3d4553e8d0f..4f52cb3c131 100644 --- a/mysql-test/suite/parts/r/partition_alter2_1_maria.result +++ b/mysql-test/suite/parts/r/partition_alter2_1_maria.result @@ -1,5 +1,5 @@ SET @max_row = 20; -SET @@session.storage_engine = 'MARIA'; +SET @@session.storage_engine = 'Aria'; #------------------------------------------------------------------------ # 0. Setting of auxiliary variables + Creation of an auxiliary tables @@ -73,7 +73,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -538,7 +538,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -1017,16 +1017,16 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -1507,14 +1507,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -1987,14 +1987,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -2477,21 +2477,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -2972,21 +2972,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -3465,13 +3465,13 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -3951,7 +3951,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -4468,7 +4468,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -4999,16 +4999,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -5541,14 +5541,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -6073,14 +6073,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -6615,21 +6615,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -7162,21 +7162,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -7707,13 +7707,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -8243,7 +8243,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -8760,7 +8760,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -9291,16 +9291,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -9833,14 +9833,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -10365,14 +10365,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -10907,21 +10907,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -11454,21 +11454,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -11999,13 +11999,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -12539,7 +12539,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -13004,7 +13004,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -13483,16 +13483,16 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -13973,14 +13973,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -14453,14 +14453,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -14943,21 +14943,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -15438,21 +15438,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -15931,13 +15931,13 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -16415,7 +16415,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ @@ -16880,7 +16880,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ @@ -17359,16 +17359,16 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -17849,14 +17849,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -18329,14 +18329,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -18817,21 +18817,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -19312,21 +19312,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -19805,13 +19805,13 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -20291,7 +20291,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -20808,7 +20808,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -21339,16 +21339,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -21881,14 +21881,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -22413,14 +22413,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -22955,21 +22955,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -23502,21 +23502,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -24047,13 +24047,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -24583,7 +24583,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ @@ -25100,7 +25100,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ @@ -25631,16 +25631,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -26173,14 +26173,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -26705,14 +26705,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -27245,21 +27245,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -27792,21 +27792,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -28337,13 +28337,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -28873,7 +28873,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -29390,7 +29390,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -29921,16 +29921,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -30463,14 +30463,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -30995,14 +30995,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -31537,21 +31537,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -32084,21 +32084,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -32629,13 +32629,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -33165,7 +33165,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ @@ -33682,7 +33682,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ @@ -34213,16 +34213,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -34755,14 +34755,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -35287,14 +35287,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -35827,21 +35827,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -36374,21 +36374,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -36919,13 +36919,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD diff --git a/mysql-test/suite/parts/r/partition_alter2_2_maria.result b/mysql-test/suite/parts/r/partition_alter2_2_maria.result index 2dc7023100c..f310169fb6e 100644 --- a/mysql-test/suite/parts/r/partition_alter2_2_maria.result +++ b/mysql-test/suite/parts/r/partition_alter2_2_maria.result @@ -1,5 +1,5 @@ SET @max_row = 20; -SET @@session.storage_engine = 'MARIA'; +SET @@session.storage_engine = 'Aria'; #------------------------------------------------------------------------ # 0. Setting of auxiliary variables + Creation of an auxiliary tables @@ -73,7 +73,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -540,7 +540,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -1021,16 +1021,16 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -1513,14 +1513,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -1993,14 +1993,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -2485,21 +2485,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -2980,21 +2980,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -3475,13 +3475,13 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -3963,7 +3963,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -4482,7 +4482,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -5015,16 +5015,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -5559,14 +5559,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -6091,14 +6091,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -6635,21 +6635,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -7182,21 +7182,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -7729,13 +7729,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -8267,7 +8267,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -8786,7 +8786,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -9319,16 +9319,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -9863,14 +9863,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -10395,14 +10395,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -10939,21 +10939,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -11486,21 +11486,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -12033,13 +12033,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -12574,7 +12574,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -13042,7 +13042,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -13524,16 +13524,16 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -14017,14 +14017,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -14502,14 +14502,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -14995,21 +14995,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -15495,21 +15495,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -15991,13 +15991,13 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -16478,7 +16478,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ @@ -16946,7 +16946,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ @@ -17428,16 +17428,16 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -17921,14 +17921,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -18406,14 +18406,14 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -18899,21 +18899,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -19399,21 +19399,21 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -19895,13 +19895,13 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -20384,7 +20384,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -20904,7 +20904,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -21438,16 +21438,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -21983,14 +21983,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -22520,14 +22520,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -23065,21 +23065,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -23617,21 +23617,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -24165,13 +24165,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -24704,7 +24704,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ @@ -25224,7 +25224,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ @@ -25758,16 +25758,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -26303,14 +26303,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -26840,14 +26840,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -27385,21 +27385,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -27937,21 +27937,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -28485,13 +28485,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -29024,7 +29024,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ @@ -29544,7 +29544,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ @@ -30078,16 +30078,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -30623,14 +30623,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -31160,14 +31160,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -31705,21 +31705,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -32257,21 +32257,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -32805,13 +32805,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD @@ -33344,7 +33344,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ @@ -33864,7 +33864,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ @@ -34398,16 +34398,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) -(PARTITION part_3 VALUES IN (-3) ENGINE = MARIA, - PARTITION part_2 VALUES IN (-2) ENGINE = MARIA, - PARTITION part_1 VALUES IN (-1) ENGINE = MARIA, - PARTITION part_N VALUES IN (NULL) ENGINE = MARIA, - PARTITION part0 VALUES IN (0) ENGINE = MARIA, - PARTITION part1 VALUES IN (1) ENGINE = MARIA, - PARTITION part2 VALUES IN (2) ENGINE = MARIA, - PARTITION part3 VALUES IN (3) ENGINE = MARIA) */ +(PARTITION part_3 VALUES IN (-3) ENGINE = Aria, + PARTITION part_2 VALUES IN (-2) ENGINE = Aria, + PARTITION part_1 VALUES IN (-1) ENGINE = Aria, + PARTITION part_N VALUES IN (NULL) ENGINE = Aria, + PARTITION part0 VALUES IN (0) ENGINE = Aria, + PARTITION part1 VALUES IN (1) ENGINE = Aria, + PARTITION part2 VALUES IN (2) ENGINE = Aria, + PARTITION part3 VALUES IN (3) ENGINE = Aria) */ unified filelist t1#P#part0.MAD @@ -34943,14 +34943,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (15) ENGINE = MARIA, - PARTITION parte VALUES LESS THAN (20) ENGINE = MARIA, - PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (15) ENGINE = Aria, + PARTITION parte VALUES LESS THAN (20) ENGINE = Aria, + PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta.MAD @@ -35480,14 +35480,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 -(PARTITION parta VALUES LESS THAN (0) ENGINE = MARIA, - PARTITION partb VALUES LESS THAN (5) ENGINE = MARIA, - PARTITION partc VALUES LESS THAN (10) ENGINE = MARIA, - PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MARIA) */ +(PARTITION parta VALUES LESS THAN (0) ENGINE = Aria, + PARTITION partb VALUES LESS THAN (5) ENGINE = Aria, + PARTITION partc VALUES LESS THAN (10) ENGINE = Aria, + PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */ unified filelist t1#P#parta#SP#partasp0.MAD @@ -36025,21 +36025,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) - (SUBPARTITION subpart11 ENGINE = MARIA, - SUBPARTITION subpart12 ENGINE = MARIA), + (SUBPARTITION subpart11 ENGINE = Aria, + SUBPARTITION subpart12 ENGINE = Aria), PARTITION part2 VALUES LESS THAN (5) - (SUBPARTITION subpart21 ENGINE = MARIA, - SUBPARTITION subpart22 ENGINE = MARIA), + (SUBPARTITION subpart21 ENGINE = Aria, + SUBPARTITION subpart22 ENGINE = Aria), PARTITION part3 VALUES LESS THAN (10) - (SUBPARTITION subpart31 ENGINE = MARIA, - SUBPARTITION subpart32 ENGINE = MARIA), + (SUBPARTITION subpart31 ENGINE = Aria, + SUBPARTITION subpart32 ENGINE = Aria), PARTITION part4 VALUES LESS THAN (2147483646) - (SUBPARTITION subpart41 ENGINE = MARIA, - SUBPARTITION subpart42 ENGINE = MARIA)) */ + (SUBPARTITION subpart41 ENGINE = Aria, + SUBPARTITION subpart42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#subpart11.MAD @@ -36577,21 +36577,21 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) - (SUBPARTITION sp11 ENGINE = MARIA, - SUBPARTITION sp12 ENGINE = MARIA), + (SUBPARTITION sp11 ENGINE = Aria, + SUBPARTITION sp12 ENGINE = Aria), PARTITION part2 VALUES IN (1) - (SUBPARTITION sp21 ENGINE = MARIA, - SUBPARTITION sp22 ENGINE = MARIA), + (SUBPARTITION sp21 ENGINE = Aria, + SUBPARTITION sp22 ENGINE = Aria), PARTITION part3 VALUES IN (2) - (SUBPARTITION sp31 ENGINE = MARIA, - SUBPARTITION sp32 ENGINE = MARIA), + (SUBPARTITION sp31 ENGINE = Aria, + SUBPARTITION sp32 ENGINE = Aria), PARTITION part4 VALUES IN (NULL) - (SUBPARTITION sp41 ENGINE = MARIA, - SUBPARTITION sp42 ENGINE = MARIA)) */ + (SUBPARTITION sp41 ENGINE = Aria, + SUBPARTITION sp42 ENGINE = Aria)) */ unified filelist t1#P#part1#SP#sp11.MAD @@ -37125,13 +37125,13 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) -) ENGINE=MARIA DEFAULT CHARSET=latin1 +) ENGINE=Aria DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 -(PARTITION part1 VALUES IN (0) ENGINE = MARIA, - PARTITION part2 VALUES IN (1) ENGINE = MARIA, - PARTITION part3 VALUES IN (NULL) ENGINE = MARIA) */ +(PARTITION part1 VALUES IN (0) ENGINE = Aria, + PARTITION part2 VALUES IN (1) ENGINE = Aria, + PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */ unified filelist t1#P#part1#SP#part1sp0.MAD diff --git a/mysql-test/suite/parts/r/partition_auto_increment_maria.result b/mysql-test/suite/parts/r/partition_auto_increment_maria.result index 647c2d3e936..757eaca3a60 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_maria.result +++ b/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); diff --git a/mysql-test/suite/parts/t/partition_alter2_1_maria.test b/mysql-test/suite/parts/t/partition_alter2_1_maria.test index 88be2fb785f..47f6c4cb302 100644 --- a/mysql-test/suite/parts/t/partition_alter2_1_maria.test +++ b/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 ##### diff --git a/mysql-test/suite/parts/t/partition_alter2_2_maria.test b/mysql-test/suite/parts/t/partition_alter2_2_maria.test index 5e8b9b7d9f2..e8172de3fb4 100644 --- a/mysql-test/suite/parts/t/partition_alter2_2_maria.test +++ b/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 ##### diff --git a/mysql-test/suite/parts/t/partition_auto_increment_maria.test b/mysql-test/suite/parts/t/partition_auto_increment_maria.test index 5f1515ec929..2a77a9e4b61 100644 --- a/mysql-test/suite/parts/t/partition_auto_increment_maria.test +++ b/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 diff --git a/mysql-test/t/bug46080-master.opt b/mysql-test/t/bug46080-master.opt index ff809c0cc69..b1c244a121c 100644 --- a/mysql-test/t/bug46080-master.opt +++ b/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 diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index f3cd48af543..b59fa9edb9f 100644 --- a/mysql-test/t/create.test +++ b/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; diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index c89c7cd875e..828670d9408 100644 --- a/scripts/make_binary_distribution.sh +++ b/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/maria_ftdump$BS storage/maria/maria_read_log$BS \ - storage/maria/maria_dump_log$BS \ + storage/maria/aria_chk$BS storage/maria/aria_pack$BS \ + storage/maria/aria_ftdump$BS storage/maria/aria_read_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 \ diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index bdaa07a907f..20850245f99 100755 --- a/scripts/make_win_bin_dist +++ b/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/ diff --git a/sql/handler.cc b/sql/handler.cc index 7ff4a616fd7..64cb2b9cba6 100644 --- a/sql/handler.cc +++ b/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} }; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e89c6b0ab85..a35885220fc 100644 --- a/sql/mysqld.cc +++ b/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}, diff --git a/sql/set_var.cc b/sql/set_var.cc index f521ab6d6aa..9a49fa3dad6 100644 --- a/sql/set_var.cc +++ b/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; diff --git a/sql/sql_class.h b/sql/sql_class.h index 20f34bacca7..a430999919d 100644 --- a/sql/sql_class.h +++ b/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 diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 407c2f5bb93..03cc61f12e8 100644 --- a/sql/sql_parse.cc +++ b/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 diff --git a/sql/sql_select.cc b/sql/sql_select.cc index d7f92392c5e..8c65a27a761 100644 --- a/sql/sql_select.cc +++ b/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 diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt index 12bd3d063b5..5f88f08ccd4 100644 --- a/storage/maria/CMakeLists.txt +++ b/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) -TARGET_LINK_LIBRARIES(maria_ftdump maria myisam mysys dbug strings zlib wsock32) +ADD_EXECUTABLE(aria_ftdump maria_ftdump.c) +TARGET_LINK_LIBRARIES(aria_ftdump aria myisam mysys dbug strings zlib wsock32) -ADD_EXECUTABLE(maria_chk maria_chk.c) -TARGET_LINK_LIBRARIES(maria_chk maria myisam mysys dbug strings zlib wsock32) +ADD_EXECUTABLE(aria_chk maria_chk.c) +TARGET_LINK_LIBRARIES(aria_chk aria myisam mysys dbug strings zlib wsock32) -ADD_EXECUTABLE(maria_read_log maria_read_log.c) -TARGET_LINK_LIBRARIES(maria_read_log maria myisam mysys dbug strings zlib wsock32) +ADD_EXECUTABLE(aria_read_log maria_read_log.c) +TARGET_LINK_LIBRARIES(aria_read_log aria myisam mysys dbug strings zlib wsock32) -ADD_EXECUTABLE(maria_pack maria_pack.c) -TARGET_LINK_LIBRARIES(maria_pack maria myisam mysys dbug strings zlib wsock32) +ADD_EXECUTABLE(aria_pack maria_pack.c) +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) -TARGET_LINK_LIBRARIES(maria_dump_log maria myisam mysys dbug strings zlib wsock32) -SET_TARGET_PROPERTIES(maria_dump_log PROPERTIES COMPILE_FLAGS "-DMARIA_DUMP_LOG") +ADD_EXECUTABLE(aria_dump_log ma_loghandler.c unittest/ma_loghandler_examples.c) +TARGET_LINK_LIBRARIES(aria_dump_log aria myisam mysys dbug strings zlib wsock32) +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("maria_chk" "asInvoker") - MYSQL_EMBED_MANIFEST("maria_read_log" "asInvoker") - MYSQL_EMBED_MANIFEST("maria_pack" "asInvoker") + MYSQL_EMBED_MANIFEST("aria_ftdump" "asInvoker") + MYSQL_EMBED_MANIFEST("aria_chk" "asInvoker") + MYSQL_EMBED_MANIFEST("aria_read_log" "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) diff --git a/storage/maria/Makefile.am b/storage/maria/Makefile.am index fe674fb2837..a1fe37fc396 100644 --- a/storage/maria/Makefile.am +++ b/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 -bin_PROGRAMS = maria_chk maria_pack maria_ftdump maria_read_log \ - maria_dump_log -maria_chk_DEPENDENCIES= $(LIBRARIES) +pkglib_LIBRARIES = libaria.a +bin_PROGRAMS = aria_chk aria_pack aria_ftdump aria_read_log \ + aria_dump_log +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) -maria_pack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +aria_pack_SOURCES= maria_pack.c +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) -maria_read_log_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +aria_read_log_SOURCES= maria_read_log.c +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 -maria_dump_log_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +aria_dump_log_DEPENDENCIES=$(LIBRARIES) ma_loghandler.c +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 -maria_dump_log_CPPFLAGS= -DMARIA_DUMP_LOG +aria_dump_log_SOURCES= ma_loghandler.c unittest/ma_loghandler_examples.c +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) -maria_ftdump_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +aria_ftdump_SOURCES= maria_ftdump.c +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 diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 95ddde42e07..8dd6b33190e 100644 --- a/storage/maria/ha_maria.cc +++ b/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}, - {"Maria_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}, - {"Maria_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}, - {"Maria_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}, - {"Maria_transaction_log_syncs", (char*) &translog_syncs, SHOW_LONGLONG}, + {"Aria_pagecache_blocks_not_flushed", (char*) &maria_pagecache_var.global_blocks_changed, SHOW_LONG_NOFLUSH}, + {"Aria_pagecache_blocks_unused", (char*) &maria_pagecache_var.blocks_unused, SHOW_LONG_NOFLUSH}, + {"Aria_pagecache_blocks_used", (char*) &maria_pagecache_var.blocks_used, SHOW_LONG_NOFLUSH}, + {"Aria_pagecache_read_requests", (char*) &maria_pagecache_var.global_cache_r_requests, SHOW_LONGLONG}, + {"Aria_pagecache_reads", (char*) &maria_pagecache_var.global_cache_read, SHOW_LONGLONG}, + {"Aria_pagecache_write_requests", (char*) &maria_pagecache_var.global_cache_w_requests, SHOW_LONGLONG}, + {"Aria_pagecache_writes", (char*) &maria_pagecache_var.global_cache_write, 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", - "MySQL AB", + "Aria", + "Monty Program Ab", "Crash-safe tables with MyISAM heritage", PLUGIN_LICENSE_GPL, ha_maria_init, /* Plugin Init */ diff --git a/storage/maria/ha_maria.h b/storage/maria/ha_maria.h index 6402571f043..09e59435c2a 100644 --- a/storage/maria/ha_maria.h +++ b/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 diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c index ed3a7a46344..b21935d6ba3 100644 --- a/storage/maria/ma_check.c +++ b/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)); diff --git a/storage/maria/ma_check_standalone.h b/storage/maria/ma_check_standalone.h index 9b30c96089f..8cda285bb99 100644 --- a/storage/maria/ma_check_standalone.h +++ b/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; diff --git a/storage/maria/ma_checkpoint.h b/storage/maria/ma_checkpoint.h index 69645c6bcda..126f8111a23 100644 --- a/storage/maria/ma_checkpoint.h +++ b/storage/maria/ma_checkpoint.h @@ -89,4 +89,4 @@ static inline LSN lsn_read_non_atomic_32(const volatile LSN *x) @param sentence text to write */ #define ma_message_no_user(level, sentence) \ - my_printf_error(HA_ERR_GENERIC, "Maria engine: %s", MYF(level), sentence) + my_printf_error(HA_ERR_GENERIC, "Aria engine: %s", MYF(level), sentence) diff --git a/storage/maria/ma_control_file.c b/storage/maria/ma_control_file.c index ac246f09337..6f9018885e9 100644 --- a/storage/maria/ma_control_file.c +++ b/storage/maria/ma_control_file.c @@ -234,7 +234,7 @@ static int lock_control_file(const char *name) { if (retry == 0) my_printf_error(HA_ERR_INITIALIZATION, - "Can't lock maria control file '%s' for exclusive use, " + "Can't lock aria control file '%s' for exclusive use, " "error: %d. Will retry for %d seconds", 0, name, my_errno, MARIA_MAX_CONTROL_FILE_LOCK_RETRY); if (retry++ > MARIA_MAX_CONTROL_FILE_LOCK_RETRY) @@ -372,14 +372,14 @@ CONTROL_FILE_ERROR ma_control_file_open(my_bool create_if_missing, CF_MAGIC_STRING, CF_MAGIC_STRING_SIZE)) { error= CONTROL_FILE_BAD_MAGIC_STRING; - errmsg= "Missing valid id at start of file. File is not a valid maria control file"; + errmsg= "Missing valid id at start of file. File is not a valid aria control file"; goto err; } if (buffer[CF_VERSION_OFFSET] > CONTROL_FILE_VERSION) { error= CONTROL_FILE_BAD_VERSION; - sprintf(errmsg_buff, "File is from a future maria system: %d. Current version is: %d", + sprintf(errmsg_buff, "File is from a future aria system: %d. Current version is: %d", (int) buffer[CF_VERSION_OFFSET], CONTROL_FILE_VERSION); errmsg= errmsg_buff; goto err; @@ -402,7 +402,7 @@ CONTROL_FILE_ERROR ma_control_file_open(my_bool create_if_missing, { error= CONTROL_FILE_WRONG_BLOCKSIZE; sprintf(errmsg_buff, - "Block size in control file (%u) is different than given maria_block_size: %u", + "Block size in control file (%u) is different than given aria_block_size: %u", new_block_size, (uint) maria_block_size); errmsg= errmsg_buff; goto err; @@ -445,7 +445,7 @@ ok: err: if (print_error) my_printf_error(HA_ERR_INITIALIZATION, - "Got error '%s' when trying to use maria control file " + "Got error '%s' when trying to use aria control file " "'%s'", 0, errmsg, name); ma_control_file_end(); /* will unlock file if needed */ DBUG_RETURN(error); diff --git a/storage/maria/ma_control_file.h b/storage/maria/ma_control_file.h index 4cb5527620d..f828ae69c6d 100644 --- a/storage/maria/ma_control_file.h +++ b/storage/maria/ma_control_file.h @@ -21,7 +21,7 @@ #ifndef _ma_control_file_h #define _ma_control_file_h -#define CONTROL_FILE_BASE_NAME "maria_log_control" +#define CONTROL_FILE_BASE_NAME "aria_log_control" /* Major version for control file. Should only be changed when doing big changes that made the new control file incompatible with all diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c index 6886dc8f291..9cf042ed21e 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_create.c @@ -653,7 +653,7 @@ int maria_create(const char *name, enum data_file_type datafile_type, if (info_length > 65535) { my_printf_error(HA_WRONG_CREATE_OPTION, - "Maria table '%s' has too many columns and/or " + "Aria table '%s' has too many columns and/or " "indexes and/or unique constraints.", MYF(0), name + dirname_length(name)); my_errno= HA_WRONG_CREATE_OPTION; @@ -841,7 +841,7 @@ int maria_create(const char *name, enum data_file_type datafile_type, */ if (_ma_test_if_reopen(filename)) { - my_printf_error(0, "MARIA table '%s' is in use " + my_printf_error(0, "Aria table '%s' is in use " "(most likely by a MERGE table). Try FLUSH TABLES.", MYF(0), name + dirname_length(name)); my_errno= HA_ERR_TABLE_EXIST; diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index d5651422aaf..dc99554a08d 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -909,7 +909,7 @@ char *translog_filename_by_fileno(uint32 file_no, char *path) DBUG_ASSERT(file_no <= 0xfffffff); /* log_descriptor.directory is already formated */ - end= strxmov(path, log_descriptor.directory, "maria_log.0000000", NullS); + end= strxmov(path, log_descriptor.directory, "aria_log.0000000", NullS); length= (uint) (int10_to_str(file_no, buff, 10) - buff); strmov(end - length +1, buff); @@ -1219,7 +1219,7 @@ my_bool translog_read_file_header(LOGHANDLER_FILE_INFO *desc, File file) DBUG_RETURN(1); } translog_interpret_file_header(desc, page_buff); - DBUG_PRINT("info", ("timestamp: %llu maria ver: %lu mysql ver: %lu " + DBUG_PRINT("info", ("timestamp: %llu aria ver: %lu mysql ver: %lu " "server id %lu page size %lu file number %lu " "max lsn: (%lu,0x%lx)", (ulonglong) desc->timestamp, @@ -3470,7 +3470,7 @@ static my_bool translog_truncate_log(TRANSLOG_ADDRESS addr) /** Applies function 'callback' to all files (in a directory) which - name looks like a log's name (maria_log.[0-9]{7}). + name looks like a log's name (aria_log.[0-9]{7}). If 'callback' returns TRUE this interrupts the walk and returns TRUE. Otherwise FALSE is returned after processing all log files. It cannot just use log_descriptor.directory because that may not yet have @@ -3496,7 +3496,7 @@ my_bool translog_walk_filenames(const char *directory, for (i= 0; i < dirp->number_off_files; i++) { char *file= dirp->dir_entry[i].name; - if (strncmp(file, "maria_log.", 10) == 0 && + if (strncmp(file, "aria_log.", 10) == 0 && file[10] >= '0' && file[10] <= '9' && file[11] >= '0' && file[11] <= '9' && file[12] >= '0' && file[12] <= '9' && @@ -3727,7 +3727,7 @@ my_bool translog_init_with_table(const char *directory, my_bool pageok; DBUG_PRINT("info", ("log found...")); /* - TODO: scan directory for maria_log.XXXXXXXX files and find + TODO: scan directory for aria_log.XXXXXXXX files and find highest XXXXXXXX & set logs_found TODO: check that last checkpoint within present log addresses space @@ -8864,13 +8864,13 @@ void translog_soft_sync_end(void) #ifdef MARIA_DUMP_LOG #include <my_getopt.h> extern void translog_example_table_init(); -static const char *load_default_groups[]= { "maria_dump_log",0 }; +static const char *load_default_groups[]= { "aria_dump_log",0 }; static void get_options(int *argc,char * * *argv); #ifndef DBUG_OFF #if defined(__WIN__) -const char *default_dbug_option= "d:t:i:O,\\maria_dump_log.trace"; +const char *default_dbug_option= "d:t:i:O,\\aria_dump_log.trace"; #else -const char *default_dbug_option= "d:t:i:o,/tmp/maria_dump_log.trace"; +const char *default_dbug_option= "d:t:i:o,/tmp/aria_dump_log.trace"; #endif #endif static ulonglong opt_offset; @@ -8927,7 +8927,7 @@ static void usage(void) puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,"); puts("and you are welcome to modify and redistribute it under the GPL license\n"); - puts("Dump content of maria log pages."); + puts("Dump content of aria log pages."); VOID(printf("\nUsage: %s -f file OPTIONS\n", my_progname_short)); my_print_help(my_long_options); print_defaults("my", load_default_groups); @@ -8984,7 +8984,7 @@ static void dump_header_page(uchar *buff) translog_interpret_file_header(&desc, buff); printf(" This can be header page:\n" " Timestamp: %s\n" - " Maria log version: %lu\n" + " Aria log version: %lu\n" " Server version: %lu\n" " Server id %lu\n" " Page size %lu\n", diff --git a/storage/maria/ma_recovery.c b/storage/maria/ma_recovery.c index b4fe96ae168..f15318cb4f3 100644 --- a/storage/maria/ma_recovery.c +++ b/storage/maria/ma_recovery.c @@ -211,12 +211,12 @@ int maria_recovery_from_log(void) maria_in_recovery= TRUE; #ifdef EXTRA_DEBUG - fn_format(name_buff, "maria_recovery.trace", maria_data_root, "", MYF(0)); + fn_format(name_buff, "aria_recovery.trace", maria_data_root, "", MYF(0)); trace_file= my_fopen(name_buff, O_WRONLY|O_APPEND|O_CREAT, MYF(MY_WME)); #else trace_file= NULL; /* no trace file for being fast */ #endif - tprint(trace_file, "TRACE of the last MARIA recovery from mysqld\n"); + tprint(trace_file, "TRACE of the last Aria recovery from mysqld\n"); DBUG_ASSERT(maria_pagecache->inited); res= maria_apply_log(LSN_IMPOSSIBLE, LSN_IMPOSSIBLE, MARIA_LOG_APPLY, trace_file, TRUE, TRUE, TRUE, &warnings_count); @@ -508,14 +508,14 @@ end: if (!trace_file) fputc('\n', stderr); my_message(HA_ERR_INITIALIZATION, - "Maria recovery failed. Please run maria_chk -r on all maria " - "tables and delete all maria_log.######## files", MYF(0)); + "Aria recovery failed. Please run aria_chk -r on all Aria " + "tables and delete all aria_log.######## files", MYF(0)); } procent_printed= 0; /* We don't cleanly close tables if we hit some error (may corrupt them by flushing some wrong blocks made from wrong REDOs). It also leaves their - open_count>0, which ensures that --maria-recover, if used, will try to + open_count>0, which ensures that --aria-recover, if used, will try to repair them. */ DBUG_RETURN(error); @@ -672,7 +672,7 @@ prototype_redo_exec_hook(INCOMPLETE_LOG) failure in _ma_apply_redo_insert_row_head_or_tail(): new data page is created whereas rownr is not 0). So when the server disables logging for ALTER TABLE or CREATE SELECT, it - logs LOGREC_INCOMPLETE_LOG to warn maria_read_log and then the user. + logs LOGREC_INCOMPLETE_LOG to warn aria_read_log and then the user. Another issue is that replaying of DDLs is not correct enough to work if there was a crash during a DDL (see comment in execution of @@ -892,7 +892,7 @@ prototype_redo_exec_hook(REDO_RENAME_TABLE) new_name); /* Here is why we skip CREATE/DROP/RENAME when doing a recovery from - ha_maria (whereas we do when called from maria_read_log). Consider: + ha_maria (whereas we do when called from aria_read_log). Consider: CREATE TABLE t; RENAME TABLE t to u; DROP TABLE u; @@ -912,8 +912,8 @@ prototype_redo_exec_hook(REDO_RENAME_TABLE) crash. We however sync files and directories at each file rename. The SQL layer is anyway not crash-safe for DDLs (except the repartioning-related ones). - We replay DDLs in maria_read_log to be able to recreate tables from - scratch. It means that "maria_read_log -a" should not be used on a + We replay DDLs in aria_read_log to be able to recreate tables from + scratch. It means that "aria_read_log -a" should not be used on a database which just crashed during a DDL. And also ALTER TABLE does not log insertions of records into the temporary table, so replaying may fail (grep for INCOMPLETE_LOG in files). @@ -1317,7 +1317,7 @@ static int new_table(uint16 sid, const char *name, LSN lsn_of_file_id) if (maria_is_crashed(info)) { eprint(tracef, "Table '%s' is crashed, skipping it. Please repair it with" - " maria_chk -r", share->open_file_name.str); + " aria_chk -r", share->open_file_name.str); recovery_found_crashed_tables++; error= -1; /* not fatal, try with other tables */ goto end; @@ -1976,7 +1976,7 @@ prototype_redo_exec_hook(IMPORTED_TABLE) return 1; } name= (char *)log_record_buffer.str; - tprint(tracef, "Table '%s' was imported (auto-zerofilled) in this Maria instance\n", name); + tprint(tracef, "Table '%s' was imported (auto-zerofilled) in this Aria instance\n", name); return 0; } diff --git a/storage/maria/ma_sort.c b/storage/maria/ma_sort.c index 387563ebaac..5c36c2fba75 100644 --- a/storage/maria/ma_sort.c +++ b/storage/maria/ma_sort.c @@ -154,7 +154,7 @@ int _ma_create_index_by_sort(MARIA_SORT_PARAM *info, my_bool no_messages, keys < (uint) maxbuffer) { _ma_check_print_error(info->sort_info->param, - "maria_sort_buffer_size is too small"); + "aria_sort_buffer_size is too small"); goto err; } } @@ -178,7 +178,7 @@ int _ma_create_index_by_sort(MARIA_SORT_PARAM *info, my_bool no_messages, } if (memavl < MIN_SORT_MEMORY) { - _ma_check_print_error(info->sort_info->param, "Maria sort buffer" + _ma_check_print_error(info->sort_info->param, "Aria sort buffer" " too small"); /* purecov: tested */ goto err; /* purecov: tested */ } @@ -377,7 +377,7 @@ pthread_handler_t _ma_thr_find_all_keys(void *arg) keys < maxbuffer) { _ma_check_print_error(sort_param->sort_info->param, - "maria_sort_buffer_size is too small"); + "aria_sort_buffer_size is too small"); goto err; } } @@ -405,7 +405,7 @@ pthread_handler_t _ma_thr_find_all_keys(void *arg) if (memavl < MIN_SORT_MEMORY) { _ma_check_print_error(sort_param->sort_info->param, - "Maria sort buffer too small"); + "Aria sort buffer too small"); goto err; /* purecov: tested */ } diff --git a/storage/maria/ma_test_force_start.pl b/storage/maria/ma_test_force_start.pl index 7ab8190a738..8148b2f212b 100755 --- a/storage/maria/ma_test_force_start.pl +++ b/storage/maria/ma_test_force_start.pl @@ -6,7 +6,7 @@ use warnings; my $usage= <<EOF; This program tests that the options ---maria-force-start-after-recovery-failures --maria-recover work as +--aria-force-start-after-recovery-failures --aria-recover work as expected. It has to be run from directory mysql-test, and works with non-debug and debug binaries. @@ -43,7 +43,7 @@ my $error_log_name= "./var/log/master.err"; my @cmd_output; my $whatever; # garbage data $ENV{MTR_VERSION} = 1; # MTR2 does not have --start-and-exit -my $base_server_cmd= "perl mysql-test-run.pl --mysqld=--maria-force-start-after-recovery-failures=$force_after --suite=maria maria.maria-recover ";
+my $base_server_cmd= "perl mysql-test-run.pl --mysqld=--aria-force-start-after-recovery-failures=$force_after --suite=maria maria.maria-recover ";
if ($^O =~ /^mswin/i) { print <<EOF; @@ -101,7 +101,7 @@ open(FILE, ">", $sql_name) or die; # sort_get_next_record() whose failure itself does not cause a retry. print FILE "create table t1 (a varchar(1000)". - ($corrupt_index ? ", index(a)" : "") .") engine=maria;\n"; + ($corrupt_index ? ", index(a)" : "") .") engine=aria;\n"; print FILE <<EOF; insert into t1 values("ThursdayMorningsMarket"); # If Recovery executes REDO_INDEX_NEW_PAGE it will overwrite our @@ -109,7 +109,7 @@ insert into t1 values("ThursdayMorningsMarket"); # create_rename_lsn using OPTIMIZE TABLE. This also makes sure to put # the pages on disk, so that we can corrupt them. optimize table t1; -# mark table open, so that --maria-recover repairs it +# mark table open, so that --aria-recover repairs it insert into t1 select concat(a,'b') from t1 limit 1; EOF close FILE; @@ -123,7 +123,7 @@ kill_server(9); print "ruining " . ($corrupt_index ? "first page of keys" : "bitmap page") . - " in table to test maria-recover\n"; + " in table to test aria-recover\n"; open(FILE, "+<", "./var/master-data/test/t1.$corrupt_file") or die; $whatever= ("\xAB" x 100); sysseek (FILE, $corrupt_index ? 8192 : (8192-100-100), 0) or die; @@ -131,7 +131,7 @@ syswrite (FILE, $whatever) or die; close FILE; print "ruining log to make recovery fail; mysqld should fail the $force_after first restarts\n"; -open(FILE, "+<", "./var/tmp/maria_log.00000001") or die; +open(FILE, "+<", "./var/tmp/aria_log.00000001") or die; $whatever= ("\xAB" x 8192); sysseek (FILE, 99, 0) or die; syswrite (FILE, $whatever) or die; @@ -148,8 +148,8 @@ for($i= 1; $i <= $force_after; $i= $i + 1) open(FILE, "<", $error_log_name) or die; @cmd_output= <FILE>; close FILE; - die unless grep(/\[ERROR\] mysqld(.exe)*: Maria engine: log initialization failed/, @cmd_output); - die unless grep(/\[ERROR\] Plugin 'MARIA' init function returned error./, @cmd_output); + die unless grep(/\[ERROR\] mysqld(.exe)*: Aria engine: log initialization failed/, @cmd_output); + die unless grep(/\[ERROR\] Plugin 'Aria' init function returned error./, @cmd_output); print "failed - ok\n"; } @@ -160,13 +160,13 @@ die if $?; open(FILE, "<", $error_log_name) or die; @cmd_output= <FILE>; close FILE; -die unless grep(/\[Warning\] mysqld(.exe)*: Maria engine: removed all logs after [\d]+ consecutive failures of recovery from logs/, @cmd_output); -die unless grep(/\[ERROR\] mysqld(.exe)*: File '.*tmp.maria_log.00000001' not found \(Errcode: 2\)/, @cmd_output); +die unless grep(/\[Warning\] mysqld(.exe)*: Aria engine: removed all logs after [\d]+ consecutive failures of recovery from logs/, @cmd_output); +die unless grep(/\[ERROR\] mysqld(.exe)*: File '.*tmp.aria_log.00000001' not found \(Errcode: 2\)/, @cmd_output); print "success - ok\n"; open(FILE, ">", $sql_name) or die; print FILE <<EOF; -set global maria_recover=normal; +set global aria_recover=normal; insert into t1 values('aaa'); EOF close FILE; diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index 18426e468cd..aba5efaf7ef 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -36,7 +36,7 @@ SET_STACK_SIZE(9000) /* Minimum stack size for program */ static uint decode_bits; static char **default_argv; -static const char *load_default_groups[]= { "maria_chk", 0 }; +static const char *load_default_groups[]= { "aria_chk", 0 }; static const char *set_collation_name, *opt_tmpdir, *opt_log_dir; static CHARSET_INFO *set_collation; static int stopwords_inited= 0; @@ -80,8 +80,8 @@ static const char *bitmap_description[]= }; static const char *maria_stats_method_str="nulls_unequal"; -static char default_open_errmsg[]= "%d when opening MARIA-table '%s'"; -static char default_close_errmsg[]= "%d when closing MARIA-table '%s'"; +static char default_open_errmsg[]= "%d when opening Aria table '%s'"; +static char default_close_errmsg[]= "%d when closing Aria table '%s'"; static void get_options(int *argc,char * * *argv); static void print_version(void); @@ -181,7 +181,7 @@ end: char buff[22],buff2[22]; if (!(check_param.testflag & T_SILENT) || check_param.testflag & T_INFO) puts("\n---------"); - printf("\nTotal of all %d MARIA-files:\nData records: %9s Deleted blocks: %9s\n",check_param.total_files,llstr(check_param.total_records,buff), + printf("\nTotal of all %d Aria-files:\nData records: %9s Deleted blocks: %9s\n",check_param.total_files,llstr(check_param.total_records,buff), llstr(check_param.total_deleted,buff2)); } free_defaults(default_argv); @@ -266,7 +266,7 @@ static struct my_option my_long_options[] = "Print statistics information about table that is checked.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"keys-used", 'k', - "Tell MARIA to update only some specific keys. # is a bit mask of which keys to use. This can be used to get faster inserts.", + "Tell Aria to update only some specific keys. # is a bit mask of which keys to use. This can be used to get faster inserts.", &check_param.keys_in_use, &check_param.keys_in_use, 0, GET_ULL, REQUIRED_ARG, -1, 0, 0, 0, 0, 0}, @@ -278,7 +278,7 @@ static struct my_option my_long_options[] = "Path for log files.", (char**) &opt_log_dir, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"max-record-length", OPT_MAX_RECORD_LENGTH, - "Skip rows bigger than this if maria_chk can't allocate memory to hold it", + "Skip rows bigger than this if aria_chk can't allocate memory to hold it", &check_param.max_record_length, &check_param.max_record_length, 0, GET_ULL, REQUIRED_ARG, LONGLONG_MAX, 0, LONGLONG_MAX, 0, 0, 0}, @@ -324,7 +324,7 @@ static struct my_option my_long_options[] = "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"silent", 's', - "Only print errors. One can use two -s to make maria_chk very silent.", + "Only print errors. One can use two -s to make aria_chk very silent.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, #ifndef DBUG_OFF #ifdef SAFEMALLOC @@ -353,7 +353,7 @@ static struct my_option my_long_options[] = "properly closed'", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"unpack", 'u', - "Unpack file packed with mariapack.", + "Unpack file packed with ariapack.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"verbose", 'v', "Print more information. This can be used with --description and --check. Use many -v for more verbosity!", @@ -400,7 +400,7 @@ static struct my_option my_long_options[] = { "ft_max_word_len", OPT_FT_MAX_WORD_LEN, "", &ft_max_word_len, &ft_max_word_len, 0, GET_ULONG, REQUIRED_ARG, HA_FT_MAXCHARLEN, 10, HA_FT_MAXCHARLEN, 0, 1, 0}, - { "maria_ft_stopword_file", OPT_FT_STOPWORD_FILE, + { "aria_ft_stopword_file", OPT_FT_STOPWORD_FILE, "Use stopwords from this file instead of built-in list.", (char**) &ft_stopword_file, (char**) &ft_stopword_file, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -436,7 +436,7 @@ static void usage(void) print_version(); puts("By Monty, for your professional use"); puts("This software comes with NO WARRANTY: see the PUBLIC for details.\n"); - puts("Description, check and repair of MARIA tables."); + puts("Description, check and repair of Aria tables."); puts("Used without options all tables on the command will be checked for errors"); printf("Usage: %s [OPTIONS] tables[.MAI]\n", my_progname_short); printf("\nGlobal options:\n"); @@ -460,10 +460,10 @@ static void usage(void) #endif printf(", they will be used\n\ in a round-robin fashion.\n\ - --require-control-file Abort if we can't find/read the maria_log_control\n\ + --require-control-file Abort if we can't find/read the aria_log_control\n\ file\n\ -s, --silent Only print errors. One can use two -s to make\n\ - maria_chk very silent.\n\ + aria_chk very silent.\n\ -v, --verbose Print more information. This can be used with\n\ --description and --check. Use many -v for more verbosity.\n\ -V, --version Print version and exit.\n\ @@ -472,10 +472,10 @@ static void usage(void) puts(" --start-check-pos=# Start reading file at given offset.\n"); #endif - puts("Check options (check is the default action for maria_chk):\n\ + puts("Check options (check is the default action for aria_chk):\n\ -c, --check Check table for errors.\n\ -e, --extend-check Check the table VERY throughly. Only use this in\n\ - extreme cases as maria_chk should normally be able to\n\ + extreme cases as aria_chk should normally be able to\n\ find out if the table is ok even without this switch.\n\ -F, --fast Check only tables that haven't been closed properly.\n\ -C, --check-only-changed\n\ @@ -497,11 +497,11 @@ static void usage(void) Normally this will also find a lot of garbage rows;\n\ Don't use this option if you are not totally desperate.\n\ -f, --force Overwrite old temporary files.\n\ - -k, --keys-used=# Tell MARIA to update only some specific keys. # is a\n\ + -k, --keys-used=# Tell Aria to update only some specific keys. # is a\n\ bit mask of which keys to use. This can be used to\n\ get faster inserts.\n\ --max-record-length=#\n\ - Skip rows bigger than this if maria_chk can't allocate\n\ + Skip rows bigger than this if aria_chk can't allocate\n\ memory to hold it.\n\ -r, --recover Can fix almost anything except unique keys that aren't\n\ unique.\n\ @@ -515,18 +515,18 @@ static void usage(void) handle a couple of cases where '-r' reports that it\n\ can't fix the data file.\n\ --transaction-log Log repair command to transaction log. This is needed\n\ - if one wants to use the maria_read_log to repeat the \n\ + if one wants to use the aria_read_log to repeat the \n\ repair\n\ --character-sets-dir=...\n\ Directory where character sets are.\n\ --set-collation=name\n\ Change the collation used by the index.\n\ -q, --quick Faster repair by not modifying the data file.\n\ - One can give a second '-q' to force maria_chk to\n\ + One can give a second '-q' to force aria_chk to\n\ modify the original datafile in case of duplicate keys.\n\ NOTE: Tables where the data file is currupted can't be\n\ fixed with this option.\n\ - -u, --unpack Unpack file packed with mariapack.\n\ + -u, --unpack Unpack file packed with ariapack.\n\ "); puts("Other actions:\n\ @@ -771,7 +771,7 @@ get_one_option(int optid, check_param.testflag|= T_UPDATE_STATE; break; case '#': - DBUG_SET_INITIAL(argument ? argument : "d:t:o,/tmp/maria_chk.trace"); + DBUG_SET_INITIAL(argument ? argument : "d:t:o,/tmp/aria_chk.trace"); opt_debug= 1; break; case OPT_SKIP_SAFEMALLOC: @@ -935,7 +935,7 @@ static int maria_chk(HA_CHECK *param, char *filename) _ma_check_print_error(param,"'%s' doesn't have a correct index definition. You need to recreate it before you can do a repair",filename); break; case HA_ERR_NOT_A_TABLE: - _ma_check_print_error(param,"'%s' is not a MARIA-table",filename); + _ma_check_print_error(param,"'%s' is not a Aria table",filename); break; case HA_ERR_CRASHED_ON_USAGE: _ma_check_print_error(param,"'%s' is marked as crashed",filename); @@ -944,10 +944,10 @@ static int maria_chk(HA_CHECK *param, char *filename) _ma_check_print_error(param,"'%s' is marked as crashed after last repair",filename); break; case HA_ERR_OLD_FILE: - _ma_check_print_error(param,"'%s' is a old type of MARIA-table", filename); + _ma_check_print_error(param,"'%s' is a old type of Aria table", filename); break; case HA_ERR_NEW_FILE: - _ma_check_print_error(param,"'%s' uses new features not supported by this version of the MARIA library", filename); + _ma_check_print_error(param,"'%s' uses new features not supported by this version of the Aria library", filename); break; case HA_ERR_END_OF_FILE: _ma_check_print_error(param,"Couldn't read complete header from '%s'", filename); @@ -963,7 +963,7 @@ static int maria_chk(HA_CHECK *param, char *filename) filename); break; default: - _ma_check_print_error(param,"%d when opening MARIA-table '%s'", + _ma_check_print_error(param,"%d when opening Aria table '%s'", my_errno,filename); break; } @@ -1030,10 +1030,10 @@ static int maria_chk(HA_CHECK *param, char *filename) if (!need_to_check) { if (!(param->testflag & T_SILENT) || param->testflag & T_INFO) - printf("MARIA file: %s is already checked\n",filename); + printf("Aria file: %s is already checked\n",filename); if (maria_close(info)) { - _ma_check_print_error(param,"%d when closing MARIA-table '%s'", + _ma_check_print_error(param,"%d when closing Aria table '%s'", my_errno,filename); DBUG_RETURN(1); } @@ -1060,7 +1060,7 @@ static int maria_chk(HA_CHECK *param, char *filename) if (maria_recreate_table(param, &info,filename)) { VOID(fprintf(stderr, - "MARIA-table '%s' is not fixed because of errors\n", + "Aria table '%s' is not fixed because of errors\n", filename)); return(-1); } @@ -1253,7 +1253,7 @@ static int maria_chk(HA_CHECK *param, char *filename) else if ((param->testflag & T_CHECK) || !(param->testflag & T_AUTO_INC)) { if (!(param->testflag & T_VERY_SILENT) || param->testflag & T_INFO) - printf("Checking MARIA file: %s\n",filename); + printf("Checking Aria file: %s\n",filename); if (!(param->testflag & T_SILENT)) printf("Data records: %7s Deleted blocks: %7s\n", llstr(info->state->records,llbuff), @@ -1369,7 +1369,7 @@ end2: if (param->testflag & (T_REP_ANY | T_SORT_RECORDS | T_SORT_INDEX)) { VOID(fprintf(stderr, - "MARIA-table '%s' is not fixed because of errors\n", + "Aria table '%s' is not fixed because of errors\n", filename)); if (param->testflag & T_REP_ANY) VOID(fprintf(stderr, @@ -1378,13 +1378,13 @@ end2: else if (!(param->error_printed & 2) && !(param->testflag & T_FORCE_CREATE)) VOID(fprintf(stderr, - "MARIA-table '%s' is corrupted\nFix it using switch \"-r\" or \"-o\"\n", + "Aria table '%s' is corrupted\nFix it using switch \"-r\" or \"-o\"\n", filename)); } else if (param->warning_printed && ! (param->testflag & (T_REP_ANY | T_SORT_RECORDS | T_SORT_INDEX | T_FORCE_CREATE))) - VOID(fprintf(stderr, "MARIA-table '%s' is usable but should be fixed\n", + VOID(fprintf(stderr, "Aria table '%s' is usable but should be fixed\n", filename)); VOID(fflush(stderr)); DBUG_RETURN(error); @@ -1415,7 +1415,7 @@ static void descript(HA_CHECK *param, register MARIA_HA *info, char *name) DBUG_VOID_RETURN; } - printf("MARIA file: %s\n",name); + printf("Aria file: %s\n",name); printf("Record format: %s\n", record_formats[share->data_file_type]); printf("Crashsafe: %s\n", share->base.born_transactional ? "yes" : "no"); @@ -1745,7 +1745,7 @@ static int maria_sort_records(HA_CHECK *param, } if (!(param->testflag & T_SILENT)) { - printf("- Sorting records for MARIA-table '%s'\n",name); + printf("- Sorting records for Aria table '%s'\n",name); if (write_info) printf("Data records: %9s Deleted: %9s\n", llstr(info->state->records,llbuff), @@ -1988,7 +1988,7 @@ static my_bool write_log_record(HA_CHECK *param) { if (write_log_record_for_repair(param, info)) _ma_check_print_error(param, "%d when writing log record for" - " MARIA-table '%s'", my_errno, + " Aria table '%s'", my_errno, param->isam_file_name); else if (maria_close(info)) _ma_check_print_error(param, default_close_errmsg, my_errno, diff --git a/storage/maria/maria_ftdump.c b/storage/maria/maria_ftdump.c index 895bbf85b0f..870d07fa96e 100644 --- a/storage/maria/maria_ftdump.c +++ b/storage/maria/maria_ftdump.c @@ -263,7 +263,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), static void usage() { - printf("Use: maria_ft_dump <table_name> <index_num>\n"); + printf("Use: aria_ft_dump <table_name> <index_num>\n"); my_print_help(my_long_options); my_print_variables(my_long_options); NETWARE_SET_SCREEN_MODE(1); diff --git a/storage/maria/maria_pack.c b/storage/maria/maria_pack.c index 167d0af3078..29f8bedff44 100644 --- a/storage/maria/maria_pack.c +++ b/storage/maria/maria_pack.c @@ -197,7 +197,7 @@ static struct st_file_buffer file_buffer; static QUEUE queue; static HUFF_COUNTS *global_count; static char zero_string[]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; -static const char *load_default_groups[]= { "mariapack",0 }; +static const char *load_default_groups[]= { "ariapack",0 }; /* The main program */ @@ -238,7 +238,7 @@ int main(int argc, char **argv) } } if (ok && isamchk_neaded && !silent) - puts("Remember to run maria_chk -rq on compressed tables"); + puts("Remember to run aria_chk -rq on compressed tables"); VOID(fflush(stdout)); VOID(fflush(stderr)); free_defaults(default_argv); @@ -306,11 +306,11 @@ static void usage(void) puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,"); puts("and you are welcome to modify and redistribute it under the GPL license\n"); - puts("Pack a MARIA-table to take much less space."); - puts("Keys are not updated, you must run maria_chk -rq on the index (.MAI) file"); + puts("Pack a Aria-table to take much less space."); + puts("Keys are not updated, you must run aria_chk -rq on the index (.MAI) file"); puts("afterwards to update the keys."); puts("You should give the .MAI file as the filename argument."); - puts("To unpack a packed table, run maria_chk -u on the table"); + puts("To unpack a packed table, run aria_chk -u on the table"); VOID(printf("\nUsage: %s [OPTIONS] filename...\n", my_progname)); my_print_help(my_long_options); @@ -359,7 +359,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), silent= 0; break; case '#': - DBUG_PUSH(argument ? argument : "d:t:o,/tmp/maria_pack.trace"); + DBUG_PUSH(argument ? argument : "d:t:o,/tmp/aria_pack.trace"); break; case 'V': print_version(); @@ -2990,7 +2990,7 @@ static int save_state(MARIA_HA *isam_file,PACK_MRG_INFO *mrg, } /* If there are no disabled indexes, keep key_file_length value from - original file so "maria_chk -rq" can use this value (this is necessary + original file so "aria_chk -rq" can use this value (this is necessary because index size cannot be easily calculated for fulltext keys) */ maria_clear_all_keys_active(share->state.key_map); diff --git a/storage/maria/maria_read_log.c b/storage/maria/maria_read_log.c index 98bc638c77f..de45eb0bcb6 100644 --- a/storage/maria/maria_read_log.c +++ b/storage/maria/maria_read_log.c @@ -20,13 +20,13 @@ #define LOG_FLAGS 0 -static const char *load_default_groups[]= { "maria_read_log",0 }; +static const char *load_default_groups[]= { "aria_read_log",0 }; static void get_options(int *argc,char * * *argv); #ifndef DBUG_OFF #if defined(__WIN__) -const char *default_dbug_option= "d:t:O,\\maria_read_log.trace"; +const char *default_dbug_option= "d:t:O,\\aria_read_log.trace"; #else -const char *default_dbug_option= "d:t:o,/tmp/maria_read_log.trace"; +const char *default_dbug_option= "d:t:o,/tmp/aria_read_log.trace"; #endif #endif /* DBUG_OFF */ static my_bool opt_display_only, opt_apply, opt_apply_undo, opt_silent; @@ -53,7 +53,7 @@ int main(int argc, char **argv) if (maria_init()) { - fprintf(stderr, "Can't init Maria engine (%d)\n", errno); + fprintf(stderr, "Can't init Aria engine (%d)\n", errno); goto err; } maria_block_size= 0; /* Use block size from file */ @@ -134,7 +134,7 @@ int main(int argc, char **argv) opt_apply_undo= 0; } - fprintf(stdout, "TRACE of the last maria_read_log\n"); + fprintf(stdout, "TRACE of the last aria_read_log\n"); if (maria_apply_log(lsn, opt_end_lsn, opt_apply ? MARIA_LOG_APPLY : (opt_check ? MARIA_LOG_CHECK : MARIA_LOG_DISPLAY_HEADER), opt_silent ? NULL : stdout, @@ -192,7 +192,7 @@ static struct my_option my_long_options[] = {"display-only", 'd', "display brief info read from records' header", &opt_display_only, &opt_display_only, 0, GET_BOOL, NO_ARG,0, 0, 0, 0, 0, 0}, - {"maria-log-dir-path", 'l', + {"aria-log-dir-path", 'l', "Path to the directory where to store transactional log", (uchar **) &maria_data_root, (uchar **) &maria_data_root, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -249,10 +249,10 @@ static void usage(void) puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,"); puts("and you are welcome to modify and redistribute it under the GPL license\n"); - puts("Display and apply log records from a MARIA transaction log"); + puts("Display and apply log records from a Aria transaction log"); puts("found in the current directory (for now)"); #ifndef IDENTICAL_PAGES_AFTER_RECOVERY - puts("\nNote: Maria is compiled without -DIDENTICAL_PAGES_AFTER_RECOVERY\n" + puts("\nNote: Aria is compiled without -DIDENTICAL_PAGES_AFTER_RECOVERY\n" "which means that the table files are not byte-to-byte identical to\n" "files created during normal execution. This should be ok, except for\n" "test scripts that tries to compare files before and after recovery."); diff --git a/storage/maria/plug.in b/storage/maria/plug.in index 686c8361a87..008d82250c8 100644 --- a/storage/maria/plug.in +++ b/storage/maria/plug.in @@ -1,21 +1,19 @@ -MYSQL_STORAGE_ENGINE(maria,, [Maria Storage Engine], +MYSQL_STORAGE_ENGINE(aria,, [Aria Storage Engine], [Crash-safe tables with MyISAM heritage], [default,max,max-no-ndb]) -MYSQL_PLUGIN_DIRECTORY(maria, [storage/maria]) -MYSQL_PLUGIN_STATIC(maria, [libmaria.a]) -# Maria will probably go first into max builds, not all builds, -# so we don't declare it mandatory. -MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(maria, [ha_maria.cc]) +MYSQL_PLUGIN_DIRECTORY(aria, [storage/maria]) +MYSQL_PLUGIN_STATIC(aria, [libaria.a]) +MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(aria, [ha_maria.cc]) -MYSQL_PLUGIN_ACTIONS(maria, [ +MYSQL_PLUGIN_ACTIONS(aria, [ # AC_CONFIG_FILES(storage/maria/unittest/Makefile) -AC_ARG_WITH(maria-tmp-tables, - AC_HELP_STRING([--with-maria-tmp-tables],[Use Maria for internal temporary tables]), - [with_maria_tmp_tables=$withval], - [with_maria_tmp_tables=yes] +AC_ARG_WITH(aria-tmp-tables, + AC_HELP_STRING([--with-aria-tmp-tables],[Use Aria for internal temporary tables]), + [with_aria_tmp_tables=$withval], + [with_aria_tmp_tables=yes] ) -if test "$with_maria_tmp_tables" = "yes" +if test "$with_aria_tmp_tables" = "yes" then - AC_DEFINE([USE_MARIA_FOR_TMP_TABLES], [1], [Maria is used for internal temporary tables]) + AC_DEFINE([USE_MARIA_FOR_TMP_TABLES], [1], [Aria is used for internal temporary tables]) fi ]) diff --git a/storage/maria/unittest/Makefile.am b/storage/maria/unittest/Makefile.am index 28c75a06b29..b5bc8587066 100644 --- a/storage/maria/unittest/Makefile.am +++ b/storage/maria/unittest/Makefile.am @@ -20,9 +20,9 @@ INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ EXTRA_DIST= ma_test_all-t CMakeLists.txt \ ma_test_recovery.pl ma_test_recovery.expected # 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). LDADD= $(top_builddir)/unittest/mytap/libmytap.a \ - $(top_builddir)/storage/maria/libmaria.a \ + $(top_builddir)/storage/maria/libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ @@ -108,8 +108,8 @@ ma_pagecache_rwconsist2_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024 # the generic lock manager may not be used in the end and lockman1-t crashes, # and lockman2-t takes at least quarter an hour, # so we don't build lockman-t and lockman1-t and lockman2-t -CLEANFILES = maria_log_control page_cache_test_file_1 \ - maria_log.???????? +CLEANFILES = aria_log_control page_cache_test_file_1 \ + aria_log.???????? # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/storage/maria/unittest/ma_control_file-t.c b/storage/maria/unittest/ma_control_file-t.c index 6702e4deb2f..164ea284f31 100644 --- a/storage/maria/unittest/ma_control_file-t.c +++ b/storage/maria/unittest/ma_control_file-t.c @@ -13,7 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* Unit test of the control file module of the Maria engine WL#3234 */ +/* Unit test of the control file module of the Aria engine WL#3234 */ /* Note that it is not possible to test the durability of the write (can't @@ -24,11 +24,11 @@ #include <my_sys.h> #include <tap.h> -#ifndef WITH_MARIA_STORAGE_ENGINE +#ifndef WITH_ARIA_STORAGE_ENGINE /* - If Maria is not compiled in, normally we don't come to building this test. + If Aria is not compiled in, normally we don't come to building this test. */ -#error "Maria engine is not compiled in, test cannot be built" +#error "Aria engine is not compiled in, test cannot be built" #endif #include "maria.h" @@ -547,7 +547,7 @@ static struct my_option my_long_options[] = static void version(void) { printf("ma_control_file_test: unit test for the control file " - "module of the Maria storage engine. Ver 1.0 \n"); + "module of the Aria storage engine. Ver 1.0 \n"); } static my_bool diff --git a/storage/maria/unittest/ma_maria_log_cleanup.c b/storage/maria/unittest/ma_maria_log_cleanup.c index 7c78bf3a1a4..6eeb0c6856a 100644 --- a/storage/maria/unittest/ma_maria_log_cleanup.c +++ b/storage/maria/unittest/ma_maria_log_cleanup.c @@ -38,7 +38,7 @@ my_bool maria_log_remove() for (i= 0; i < dirp->number_off_files; i++) { char *file= dirp->dir_entry[i].name; - if (strncmp(file, "maria_log.", 10) == 0 && + if (strncmp(file, "aria_log.", 10) == 0 && file[10] >= '0' && file[10] <= '9' && file[11] >= '0' && file[11] <= '9' && file[12] >= '0' && file[12] <= '9' && diff --git a/storage/maria/unittest/ma_test_all-t b/storage/maria/unittest/ma_test_all-t index 8e52f42b483..0b11daf7f98 100755 --- a/storage/maria/unittest/ma_test_all-t +++ b/storage/maria/unittest/ma_test_all-t @@ -20,7 +20,7 @@ $opt_number_of_tests= 0; $opt_run_tests= undef(); my $maria_path; # path to "storage/maria" -my $maria_exe_path; # path to executables (ma_test1, maria_chk etc) +my $maria_exe_path; # path to executables (ma_test1, aria_chk etc) my $my_progname= $0; $my_progname=~ s/.*[\/]//; my $runtime_error= 0; # Return 1 if error(s) occur during run @@ -146,7 +146,7 @@ sub run_tests # clean-up # - unlink <*.TMD maria_log*>; # Delete temporary files + unlink <*.TMD aria_log*>; # Delete temporary files # # Run tests @@ -280,38 +280,38 @@ sub run_check_tests for ($i= 0; defined($ma_test1_opt[$i]); $i++) { - unlink <maria_log_control maria_log.*>; + unlink <aria_log_control aria_log.*>; ok("$maria_exe_path/ma_test1$suffix $silent $ma_test1_opt[$i][0] $row_type", $verbose, $i + 1); - ok("$maria_exe_path/maria_chk$suffix $ma_test1_opt[$i][1] test1", + ok("$maria_exe_path/aria_chk$suffix $ma_test1_opt[$i][1] test1", $verbose, $i + 1); } # # These tests are outside the loops. Make sure to include them in # nr_tests manually # - ok("$maria_exe_path/maria_pack$suffix --force -s test1", $verbose, 0); - ok("$maria_exe_path/maria_chk$suffix -ess test1", $verbose, 0); + ok("$maria_exe_path/aria_pack$suffix --force -s test1", $verbose, 0); + ok("$maria_exe_path/aria_chk$suffix -ess test1", $verbose, 0); for ($i= 0; defined($ma_test2_opt[$i]); $i++) { - unlink <maria_log_control maria_log.*>; + unlink <aria_log_control aria_log.*>; ok("$maria_exe_path/ma_test2$suffix $silent $ma_test2_opt[$i][0] $row_type", $verbose, $i + 1); - ok("$maria_exe_path/maria_chk$suffix $ma_test2_opt[$i][1] test2", + ok("$maria_exe_path/aria_chk$suffix $ma_test2_opt[$i][1] test2", $verbose, $i + 1); } for ($i= 0; defined($ma_rt_test_opt[$i]); $i++) { - unlink <maria_log_control maria_log.*>; + unlink <aria_log_control aria_log.*>; ok("$maria_exe_path/ma_rt_test$suffix $silent $ma_rt_test_opt[$i][0] $row_type", $verbose, $i + 1); - ok("$maria_exe_path/maria_chk$suffix $ma_rt_test_opt[$i][1] rt_test", + ok("$maria_exe_path/aria_chk$suffix $ma_rt_test_opt[$i][1] rt_test", $verbose, $i + 1); } - unlink <maria_log_control maria_log.*>; + unlink <aria_log_control aria_log.*>; return 0; } @@ -327,34 +327,34 @@ sub run_repair_tests() my @t= ($NEW_TEST, "$maria_exe_path/ma_test1$suffix $silent --checksum $row_type", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix --silent -re --transaction-log test1", - "$maria_exe_path/maria_chk$suffix -rs test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -rqs test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -rs --correct-checksum test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -rqs --correct-checksum test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -ros --correct-checksum test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -rqos --correct-checksum test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -sz test1", - "$maria_exe_path/maria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix --silent -re --transaction-log test1", + "$maria_exe_path/aria_chk$suffix -rs test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -rqs test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -rs --correct-checksum test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -rqs --correct-checksum test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -ros --correct-checksum test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -rqos --correct-checksum test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -sz test1", + "$maria_exe_path/aria_chk$suffix -se test1", "$maria_exe_path/ma_test2$suffix $silent -c -d1 $row_type", - "$maria_exe_path/maria_chk$suffix -s --parallel-recover test2", - "$maria_exe_path/maria_chk$suffix -se test2", - "$maria_exe_path/maria_chk$suffix -s --parallel-recover --quick test2", - "$maria_exe_path/maria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -s --parallel-recover test2", + "$maria_exe_path/aria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -s --parallel-recover --quick test2", + "$maria_exe_path/aria_chk$suffix -se test2", "$maria_exe_path/ma_test2$suffix $silent -c $row_type", - "$maria_exe_path/maria_chk$suffix -se test2", - "$maria_exe_path/maria_chk$suffix -sr test2", - "$maria_exe_path/maria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -sr test2", + "$maria_exe_path/aria_chk$suffix -se test2", "$maria_exe_path/ma_test2$suffix $silent -c -t4 -b32768 $row_type", - "$maria_exe_path/maria_chk$suffix -s --zerofill test1", - "$maria_exe_path/maria_chk$suffix -se test1" + "$maria_exe_path/aria_chk$suffix -s --zerofill test1", + "$maria_exe_path/aria_chk$suffix -se test1" ); return &count_tests(\@t) if ($count); @@ -373,48 +373,48 @@ sub run_pack_tests() my @t= ($NEW_TEST, "$maria_exe_path/ma_test1$suffix $silent --checksum $row_type", - "$maria_exe_path/maria_pack$suffix --force -s test1", - "$maria_exe_path/maria_chk$suffix -ess test1", - "$maria_exe_path/maria_chk$suffix -rqs test1", - "$maria_exe_path/maria_chk$suffix -es test1", - "$maria_exe_path/maria_chk$suffix -rs test1", - "$maria_exe_path/maria_chk$suffix -es test1", - "$maria_exe_path/maria_chk$suffix -rus test1", - "$maria_exe_path/maria_chk$suffix -es test1", + "$maria_exe_path/aria_pack$suffix --force -s test1", + "$maria_exe_path/aria_chk$suffix -ess test1", + "$maria_exe_path/aria_chk$suffix -rqs test1", + "$maria_exe_path/aria_chk$suffix -es test1", + "$maria_exe_path/aria_chk$suffix -rs test1", + "$maria_exe_path/aria_chk$suffix -es test1", + "$maria_exe_path/aria_chk$suffix -rus test1", + "$maria_exe_path/aria_chk$suffix -es test1", $NEW_TEST, "$maria_exe_path/ma_test1$suffix $silent --checksum $row_type", - "$maria_exe_path/maria_pack$suffix --force -s test1", - "$maria_exe_path/maria_chk$suffix -rus --safe-recover test1", - "$maria_exe_path/maria_chk$suffix -es test1", + "$maria_exe_path/aria_pack$suffix --force -s test1", + "$maria_exe_path/aria_chk$suffix -rus --safe-recover test1", + "$maria_exe_path/aria_chk$suffix -es test1", $NEW_TEST, "$maria_exe_path/ma_test1$suffix $silent --checksum -S $row_type", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -ros test1", - "$maria_exe_path/maria_chk$suffix -rqs test1", - "$maria_exe_path/maria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -ros test1", + "$maria_exe_path/aria_chk$suffix -rqs test1", + "$maria_exe_path/aria_chk$suffix -se test1", $NEW_TEST, - "$maria_exe_path/maria_pack$suffix --force -s test1", - "$maria_exe_path/maria_chk$suffix -rqs test1", - "$maria_exe_path/maria_chk$suffix -es test1", - "$maria_exe_path/maria_chk$suffix -rus test1", - "$maria_exe_path/maria_chk$suffix -es test1", + "$maria_exe_path/aria_pack$suffix --force -s test1", + "$maria_exe_path/aria_chk$suffix -rqs test1", + "$maria_exe_path/aria_chk$suffix -es test1", + "$maria_exe_path/aria_chk$suffix -rus test1", + "$maria_exe_path/aria_chk$suffix -es test1", $NEW_TEST, "$maria_exe_path/ma_test2$suffix $silent -c -d1 $row_type", - "$maria_exe_path/maria_chk$suffix -s --parallel-recover test2", - "$maria_exe_path/maria_chk$suffix -se test2", - "$maria_exe_path/maria_chk$suffix -s --unpack --parallel-recover test2", - "$maria_exe_path/maria_chk$suffix -se test2", - "$maria_exe_path/maria_pack$suffix --force -s test1", - "$maria_exe_path/maria_chk$suffix -s --unpack --parallel-recover test2", - "$maria_exe_path/maria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -s --parallel-recover test2", + "$maria_exe_path/aria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -s --unpack --parallel-recover test2", + "$maria_exe_path/aria_chk$suffix -se test2", + "$maria_exe_path/aria_pack$suffix --force -s test1", + "$maria_exe_path/aria_chk$suffix -s --unpack --parallel-recover test2", + "$maria_exe_path/aria_chk$suffix -se test2", $NEW_TEST, "$maria_exe_path/ma_test1$suffix $silent -c $row_type", "cp test1.MAD test2.MAD", "cp test1.MAI test2.MAI", - "$maria_exe_path/maria_pack$suffix --force -s --join=test3 test1 test2", - "$maria_exe_path/maria_chk -s test3", - "$maria_exe_path/maria_chk -s --safe-recover test3", - "$maria_exe_path/maria_chk -s test3" + "$maria_exe_path/aria_pack$suffix --force -s --join=test3 test1 test2", + "$maria_exe_path/aria_chk -s test3", + "$maria_exe_path/aria_chk -s --safe-recover test3", + "$maria_exe_path/aria_chk -s test3" ); return &count_tests(\@t) if ($count); @@ -435,7 +435,7 @@ sub run_tests_on_warnings_and_errors ok("$maria_exe_path/ma_test2$suffix $silent -L -K -W -P -S -R1 -m500", $verbose, 0); - ok("$maria_exe_path/maria_chk$suffix -sm test2", $verbose, 0); + ok("$maria_exe_path/aria_chk$suffix -sm test2", $verbose, 0); # ma_test2$suffix $silent -L -K -R1 -m2000 ; Should give error 135\n # In the following a failure is a success and success is a failure $com= "$maria_exe_path/ma_test2$suffix $silent -L -K -R1 -m2000 "; @@ -443,15 +443,15 @@ sub run_tests_on_warnings_and_errors ok($com, $verbose, 0, 1); ok("cat ma_test2_message.txt", $verbose, 0); ok("grep \"Error: 135\" ma_test2_message.txt > /dev/null", $verbose, 0); - # maria_exe_path/maria_chk$suffix -sm test2 will warn that + # maria_exe_path/aria_chk$suffix -sm test2 will warn that # Datafile is almost full - ok("$maria_exe_path/maria_chk$suffix -sm test2 >ma_test2_message.txt 2>&1", + ok("$maria_exe_path/aria_chk$suffix -sm test2 >ma_test2_message.txt 2>&1", $verbose, 0); ok("cat ma_test2_message.txt", $verbose, 0); ok("grep \"warning: Datafile is almost full\" ma_test2_message.txt>/dev/null", $verbose, 0); unlink <ma_test2_message.txt>; - ok("$maria_exe_path/maria_chk$suffix -ssm test2", $verbose, 0); + ok("$maria_exe_path/aria_chk$suffix -ssm test2", $verbose, 0); return 0; } @@ -480,31 +480,31 @@ sub run_tests_on_clrs my @t= ($NEW_TEST, "$maria_exe_path/ma_test2$suffix -s -L -K -W -P -M -T -c -b -t2 -A1", - "cp maria_log_control tmp", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -s -e test2", - "cp tmp/maria_log_control .", + "cp aria_log_control tmp", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -s -e test2", + "cp tmp/aria_log_control .", "rm test2.MA?", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -s -e test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -s -e test2", "rm test2.MA?", $NEW_TEST, "$maria_exe_path/ma_test2$suffix -s -L -K -W -P -M -T -c -b -t2 -A1", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -s -e test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -s -e test2", "rm test2.MA?", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -e -s test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -e -s test2", "rm test2.MA?", $NEW_TEST, "$maria_exe_path/ma_test2$suffix -s -L -K -W -P -M -T -c -b32768 -t4 -A1", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -es test2", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -es test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -es test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -es test2", "rm test2.MA?", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -es test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -es test2", "rm test2.MA?" ); @@ -666,7 +666,7 @@ sub run_test_bunch { if ($clear && @$t[$i] eq $NEW_TEST) { - unlink <maria_log.* maria_log_control>; + unlink <aria_log.* aria_log_control>; } if (@$t[$i] ne $NEW_TEST) { @@ -686,7 +686,7 @@ $my_progname version $VER Description: -Run various Maria related tests. Typically used via make test as a unittest. +Run various Aria related tests. Typically used via make test as a unittest. Options --help Show this help and exit. diff --git a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c b/storage/maria/unittest/ma_test_loghandler_pagecache-t.c index bfbba5407c1..1644aa4885c 100644 --- a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c +++ b/storage/maria/unittest/ma_test_loghandler_pagecache-t.c @@ -31,7 +31,7 @@ static const char *default_dbug_option; #define LOG_FILE_SIZE (1024L*1024L*1024L + 1024L*1024L*512) #define LOG_FLAGS 0 -static char *first_translog_file= (char*)"maria_log.00000001"; +static char *first_translog_file= (char*)"aria_log.00000001"; static char *file1_name= (char*)"page_cache_test_file_1"; static PAGECACHE_FILE file1; diff --git a/storage/maria/unittest/ma_test_recovery.pl b/storage/maria/unittest/ma_test_recovery.pl index 130ab4131fe..d9be82f4e58 100755 --- a/storage/maria/unittest/ma_test_recovery.pl +++ b/storage/maria/unittest/ma_test_recovery.pl @@ -17,7 +17,7 @@ $opt_abort_on_error=0; my $silent= "-s"; my $maria_path; # path to "storage/maria" -my $maria_exe_path; # path to executables (ma_test1, maria_chk etc) +my $maria_exe_path; # path to executables (ma_test1, aria_chk etc) my $tmp= "./tmp"; my $my_progname= $0; my $suffix; @@ -74,7 +74,7 @@ sub main { mkdir $tmp; } - print "MARIA RECOVERY TESTS\n"; + print "ARIA RECOVERY TESTS\n"; # To not flood the screen, we redirect all the commands below to a text file # and just give a final error if their output is not as expected @@ -98,7 +98,7 @@ sub main foreach my $prog (@t) { - unlink <maria_log.* maria_log_control>; + unlink <aria_log.* aria_log_control>; my $prog_no_suffix= $prog; $prog_no_suffix=~ s/$suffix// if ($suffix); print MY_LOG "TEST WITH $prog_no_suffix\n"; @@ -113,11 +113,11 @@ sub main { die("can't guess table name"); } - $com= "$maria_exe_path/maria_chk$suffix -dvv $table "; + $com= "$maria_exe_path/aria_chk$suffix -dvv $table "; $com.= "| grep -v \"Creation time:\" | grep -v \"file length\" | grep -v \"LSNs:\" | grep -v \"UUID:\""; - $com.= "> $tmp/maria_chk_message.good.txt 2>&1"; + $com.= "> $tmp/aria_chk_message.good.txt 2>&1"; my_exec($com); - my $checksum= my_exec("$maria_exe_path/maria_chk$suffix -dss $table"); + my $checksum= my_exec("$maria_exe_path/aria_chk$suffix -dss $table"); move("$table.MAD", "$tmp/$table-good.MAD") || die "Can't move $table.MAD to $tmp/$table-good.MAD\n"; move("$table.MAI", "$tmp/$table-good.MAI") || @@ -181,7 +181,7 @@ sub main } $commit_run_args= $t2[$k + 1]; $abort_run_args= $t2[$k + 2]; - unlink <maria_log.* maria_log_control>; + unlink <aria_log.* aria_log_control>; my $prog_no_suffix= $prog; $prog_no_suffix=~ s/$suffix// if ($suffix); print MY_LOG "TEST WITH $prog_no_suffix $commit_run_args (commit at end)\n"; @@ -196,17 +196,17 @@ sub main { die("can't guess table name"); } - $com= "$maria_exe_path/maria_chk$suffix -dvv $table "; + $com= "$maria_exe_path/aria_chk$suffix -dvv $table "; $com.= "| grep -v \"Creation time:\" | grep -v \"file length\" | grep -v \"LSNs:\" | grep -v \"UUID:\" "; - $com.= "> $tmp/maria_chk_message.good.txt 2>&1"; + $com.= "> $tmp/aria_chk_message.good.txt 2>&1"; $res= my_exec($com); print MY_LOG $res; - $checksum= my_exec("$maria_exe_path/maria_chk$suffix -dss $table"); + $checksum= my_exec("$maria_exe_path/aria_chk$suffix -dss $table"); move("$table.MAD", "$tmp/$table-good.MAD") || die "Can't move $table.MAD to $tmp/$table-good.MAD\n"; move("$table.MAI", "$tmp/$table-good.MAI") || die "Can't move $table.MAI to $tmp/$table-good.MAI\n"; - unlink <maria_log.* maria_log_control>; + unlink <aria_log.* aria_log_control>; print MY_LOG "TEST WITH $prog_no_suffix $abort_run_args$test_undo[$j] (additional aborted work)\n"; $res= my_exec("$maria_exe_path/$prog $abort_run_args$test_undo[$j]"); print MY_LOG $res; @@ -216,10 +216,10 @@ sub main die "Can't copy $table.MAI to $tmp/$table-before_undo.MAI\n"; # The lines below seem unneeded, will be removed soon - # We have to copy and restore logs, as running maria_read_log will - # change the maria_control_file - # rm -f $tmp/maria_log.* $tmp/maria_log_control - # cp $maria_path/maria_log* $tmp + # We have to copy and restore logs, as running aria_read_log will + # change the aria_control_file + # rm -f $tmp/aria_log.* $tmp/aria_log_control + # cp $maria_path/aria_log* $tmp if ($test_undo[$j] != 3) { apply_log($table, "shouldchangelog"); # should undo aborted work @@ -246,13 +246,13 @@ sub main print MY_LOG $res; print MY_LOG "testing applying of CLRs to recreate table\n"; unlink <$table.MA?>; - # cp $tmp/maria_log* $maria_path #unneeded + # cp $tmp/aria_log* $maria_path #unneeded apply_log($table, "shouldnotchangelog"); check_table_is_same($table, $checksum); $res= physical_cmp($table, "$tmp/$table-after_undo"); print MY_LOG $res; } - unlink <$table.* $tmp/$table* $tmp/maria_chk_*.txt $tmp/maria_read_log_$table.txt>; + unlink <$table.* $tmp/$table* $tmp/aria_chk_*.txt $tmp/aria_read_log_$table.txt>; } } } @@ -263,7 +263,7 @@ sub main } close(MY_LOG); - # also note that maria_chk -dvv shows differences for ma_test2 in UNDO phase, + # also note that aria_chk -dvv shows differences for ma_test2 in UNDO phase, # this is normal: removing records does not shrink the data/key file, # does not put back the "analyzed,optimized keys"(etc) index state. `diff -b $maria_path/unittest/ma_test_recovery.expected $tmp/ma_test_recovery.output`; @@ -296,29 +296,29 @@ sub check_table_is_same print "checking if table $table has changed\n"; } - $com= "$maria_exe_path/maria_chk$suffix -dvv $table | grep -v \"Creation time:\" "; - $com.= "| grep -v \"file length\" | grep -v \"LSNs:\" | grep -v \"UUID:\" > $tmp/maria_chk_message.txt 2>&1"; + $com= "$maria_exe_path/aria_chk$suffix -dvv $table | grep -v \"Creation time:\" "; + $com.= "| grep -v \"file length\" | grep -v \"LSNs:\" | grep -v \"UUID:\" > $tmp/aria_chk_message.txt 2>&1"; $res= `$com`; print MY_LOG $res; - $res= `$maria_exe_path/maria_chk$suffix -ss -e --read-only $table`; + $res= `$maria_exe_path/aria_chk$suffix -ss -e --read-only $table`; print MY_LOG $res; - $checksum2= `$maria_exe_path/maria_chk$suffix -dss $table`; + $checksum2= `$maria_exe_path/aria_chk$suffix -dss $table`; if ("$checksum" ne "$checksum2") { print MY_LOG "checksum differs for $table before and after recovery\n"; return 1; } - $com= "diff $tmp/maria_chk_message.good.txt $tmp/maria_chk_message.txt "; - $com.= "> $tmp/maria_chk_diff.txt || true"; + $com= "diff $tmp/aria_chk_message.good.txt $tmp/aria_chk_message.txt "; + $com.= "> $tmp/aria_chk_diff.txt || true"; $res= `$com`; print MY_LOG $res; - if (-s "$tmp/maria_chk_diff.txt") + if (-s "$tmp/aria_chk_diff.txt") { - print MY_LOG "Differences in maria_chk -dvv, recovery not yet perfect !\n"; + print MY_LOG "Differences in aria_chk -dvv, recovery not yet perfect !\n"; print MY_LOG "========DIFF START=======\n"; - open(MY_FILE, "<$tmp/maria_chk_diff.txt") || die "Can't open file maria_chk_diff.txt\n"; + open(MY_FILE, "<$tmp/aria_chk_diff.txt") || die "Can't open file aria_chk_diff.txt\n"; while (<MY_FILE>) { print MY_LOG $_; @@ -346,13 +346,13 @@ sub apply_log print MY_LOG "bad argument '$shouldchangelog'\n"; return 1; } - foreach (<maria_log.*>) + foreach (<aria_log.*>) { $log_md5.= md5_conv($_); } print MY_LOG "applying log\n"; - my_exec("$maria_exe_path/maria_read_log$suffix -a > $tmp/maria_read_log_$table.txt"); - foreach (<maria_log.*>) + my_exec("$maria_exe_path/aria_read_log$suffix -a > $tmp/aria_read_log_$table.txt"); + foreach (<aria_log.*>) { $log_md5_2.= md5_conv($_); } @@ -360,13 +360,13 @@ sub apply_log { if ("$shouldchangelog" eq "shouldnotchangelog") { - print MY_LOG "maria_read_log should not have modified the log\n"; + print MY_LOG "aria_read_log should not have modified the log\n"; return 1; } } elsif ("$shouldchangelog" eq "shouldchangelog") { - print MY_LOG "maria_read_log should have modified the log\n"; + print MY_LOG "aria_read_log should have modified the log\n"; return 1; } } @@ -415,7 +415,7 @@ sub physical_cmp # save original tables to restore them later copy("$table.MAD", "$tmp/before_zerofill$table_no.MAD") || die(); copy("$table.MAI", "$tmp/before_zerofill$table_no.MAI") || die(); - $com= "$maria_exe_path/maria_chk$suffix -ss --zerofill-keep-lsn $table"; + $com= "$maria_exe_path/aria_chk$suffix -ss --zerofill-keep-lsn $table"; $res= `$com`; print MY_LOG $res; $table_no= $table_no + 1; @@ -467,7 +467,7 @@ $my_progname version $VER Description: -Run various maria recovery tests and print the results +Run various Aria recovery tests and print the results Options --help Show this help and exit. diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index a56c39b51a0..3025fdf5f5d 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -126,7 +126,7 @@ signal\.c : .*unused parameter.* .*/ndb/.* : .*defined but not used.* # -# Maria warning that is ok in debug builds +# Aria warning that is ok in debug builds # storage/maria/ma_pagecache.c: .*'info_check_pin' defined but not used diff --git a/win/configure-mariadb.sh b/win/configure-mariadb.sh index b6063a20dc4..fe91b2e1263 100644 --- a/win/configure-mariadb.sh +++ b/win/configure-mariadb.sh @@ -15,7 +15,7 @@ cscript win/configure.js \ WITH_FEDERATED_STORAGE_ENGINE \ WITH_MERGE_STORAGE_ENGINE \ WITH_PARTITION_STORAGE_ENGINE \ - WITH_MARIA_STORAGE_ENGINE \ + WITH_ARIA_STORAGE_ENGINE \ WITH_PBXT_STORAGE_ENGINE \ WITH_XTRADB_STORAGE_ENGINE \ WITH_EMBEDDED_SERVER diff --git a/win/configure.js b/win/configure.js index a2059f17f83..d59a12b1a57 100644 --- a/win/configure.js +++ b/win/configure.js @@ -44,17 +44,17 @@ try case "EMBED_MANIFESTS": case "EXTRA_DEBUG": case "WITH_EMBEDDED_SERVER": - case "WITHOUT_MARIA_TEMP_TABLES": + case "WITHOUT_ARIA_TEMP_TABLES": configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); break; - case "WITH_MARIA_STORAGE_ENGINE": + case "WITH_ARIA_STORAGE_ENGINE": configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); if(with_maria_tmp_tables == -1) { with_maria_tmp_tables = 1; } break; - case "WITH_MARIA_TMP_TABLES": + case "WITH_ARIA_TMP_TABLES": with_maria_tmp_tables = ( parts.length == 1 || parts[1] == "YES" || parts[1] == "TRUE"); break; @@ -73,7 +73,7 @@ try } if (with_maria_tmp_tables == 1) { - configfile.WriteLine("SET (WITH_MARIA_TMP_TABLES TRUE)"); + configfile.WriteLine("SET (WITH_ARIA_TMP_TABLES TRUE)"); } if (actual_port == 0) { |