Skip to content

M
mariadb
Commit e246077b authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

rename maria to aria

parent fa5baa12
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2619 additions and 2616 deletions
.bzrignore
View file @ e246077b
......@@ -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
......
BUILD/SETUP.sh
View file @ e246077b
......@@ -163,7 +163,7 @@ base_configs="--prefix=$prefix --enable-assembler "
base_configs="$base_configs --with-extra-charsets=complex "
base_configs="$base_configs --enable-thread-safe-client "
base_configs="$base_configs --with-big-tables"
base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables --without-plugin-innodb_plugin"
base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables --without-plugin-innodb_plugin"
# Compile our client programs with static libraries to allow them to be moved
base_configs="$base_configs --with-mysqld-ldflags=-static --with-client-ldflags=-static"
......
CMakeLists.txt
View file @ e246077b
......@@ -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
......
mysql-test/include/have_maria.inc
View file @ e246077b
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;
}
mysql-test/include/maria_empty_logs.inc
View file @ e246077b
......@@ -27,52 +27,52 @@ EOF
if (!$mel_keep_control_file)
{
--error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control;
}
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000001;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000001;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000002;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000002;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000003;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000003;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000004;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000004;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000005;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000005;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000006;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000006;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000007;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000007;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000008;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000008;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000009;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000009;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000010;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000010;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000011;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000011;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000012;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000012;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000013;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000013;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000014;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000014;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000015;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000015;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000016;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000016;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000017;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000017;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000018;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000018;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000019;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000019;
-- error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000020;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000020;
# hope there are not more than these logs...
-- error 0,1
remove_file $MYSQLD_DATADIR/maria_recovery.trace;
remove_file $MYSQLD_DATADIR/aria_recovery.trace;
append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
restart-maria_empty_logs.inc
......
mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
View file @ e246077b
......@@ -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;
mysql-test/include/maria_verify_recovery.inc
View file @ e246077b
......@@ -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
......
mysql-test/lib/v1/mysql-test-run.pl
View file @ e246077b
......@@ -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 )
{
......
mysql-test/mysql-test-run.pl
View file @ e246077b
......@@ -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>
......
mysql-test/suite/funcs_1/datadict/is_routines.inc
View file @ e246077b
......@@ -75,7 +75,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
--source suite/funcs_1/datadict/datadict_bug_12777.inc
eval DESCRIBE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc
eval SHOW COLUMNS FROM information_schema.$is_table;
......
mysql-test/suite/funcs_1/datadict/is_triggers.inc
View file @ e246077b
......@@ -70,7 +70,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
--source suite/funcs_1/datadict/datadict_bug_12777.inc
eval DESCRIBE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc
eval SHOW COLUMNS FROM information_schema.$is_table;
......
mysql-test/suite/funcs_1/datadict/is_views.inc
View file @ e246077b
......@@ -57,7 +57,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
--source suite/funcs_1/datadict/datadict_bug_12777.inc
eval DESCRIBE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc
eval SHOW COLUMNS FROM information_schema.$is_table;
......
mysql-test/suite/funcs_1/datadict/processlist_priv.inc
View file @ e246077b
......@@ -155,7 +155,7 @@ let $wait_condition=
SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE DB = 'information_schema' AND COMMAND = 'Sleep' AND USER = 'ddicttestuser1';
--source include/wait_condition.inc
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE $table;
--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS
eval SHOW $table;
......@@ -175,7 +175,7 @@ connection con100;
# No need for poll routine here.
# The current state of the default session might depend on load of testing box
# but "ddicttestuser1" must not see anything of the root session.
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE $table;
--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS
eval SHOW $table;
......
mysql-test/suite/funcs_1/datadict/processlist_val.inc
View file @ e246077b
......@@ -72,7 +72,7 @@ echo
# Show the definition of the PROCESSLIST table
#--------------------------------------------------------------------------
;
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST;
echo
......
mysql-test/suite/funcs_1/datadict/tables2.inc
View file @ e246077b
......@@ -31,7 +31,7 @@ let $ndb_pattern = 'number_of_replicas';
--vertical_results
# We do not unify the engine name here, because the rowformat is
# specific to the engine.
--replace_result Dynamic DYNAMIC_OR_PAGE Page DYNAMIC_OR_PAGE MyISAM MYISAM_OR_MARIA MARIA MYISAM_OR_MARIA
--replace_result Dynamic DYNAMIC_OR_PAGE Page DYNAMIC_OR_PAGE MyISAM MYISAM_OR_MARIA Aria MYISAM_OR_MARIA
--replace_column 8 "#TBLR#" 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "#CRT#" 16 "#UT#" 17 "#CT#" 20 "#CO#" 21 "#TC#"
eval
SELECT *,
......
mysql-test/suite/funcs_1/t/is_columns.test
View file @ e246077b
......@@ -78,7 +78,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
--source suite/funcs_1/datadict/datadict_bug_12777.inc
eval DESCRIBE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc
eval SHOW COLUMNS FROM information_schema.$is_table;
......
mysql-test/suite/funcs_1/t/is_events.test
View file @ e246077b
......@@ -89,7 +89,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
# is associated.
#
eval DESCRIBE information_schema.$is_table;
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE information_schema.$is_table;
eval SHOW COLUMNS FROM information_schema.$is_table;
......
mysql-test/suite/maria/r/group_commit.result
View file @ e246077b
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;
mysql-test/suite/maria/r/maria-autozerofill.result
View file @ e246077b
drop database if exists mysqltest;
create database mysqltest;
use mysqltest;
create table t1(a int) engine=maria;
create table t1(a int) engine=aria;
insert into t1 values(1);
flush table t1;
create_rename_lsn has non-magic value
......
mysql-test/suite/maria/r/maria-big.result
View file @ e246077b
set global max_allowed_packet=400000000;
set storage_engine=maria;
set storage_engine=aria;
affected rows: 0
drop table if exists t1, t2;
affected rows: 0
......
mysql-test/suite/maria/r/maria-big2.result
View file @ e246077b
create table t2(id int,a varchar(255),b varchar(255),key(a))engine=maria row_format=dynamic transactional=0;
create table t2(id int,a varchar(255),b varchar(255),key(a))engine=aria row_format=dynamic transactional=0;
Table Op Msg_type Msg_text
test.t2 check status OK
Table Op Msg_type Msg_text
......
mysql-test/suite/maria/r/maria-connect.result
View file @ e246077b
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;
......
mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result
View file @ e246077b
set storage_engine=maria;
set storage_engine=aria;
DROP TABLE IF EXISTS t1, t2;
CREATE TABLE t1 (
fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
......@@ -12,7 +12,7 @@ t1 CREATE TABLE `t1` (
`g` geometry NOT NULL,
PRIMARY KEY (`fid`),
SPATIAL KEY `g` (`g`)
) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=DYNAMIC
) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=DYNAMIC
INSERT INTO t1 (g) VALUES (GeomFromText('LineString(150 150, 150 150)'));
INSERT INTO t1 (g) VALUES (GeomFromText('LineString(149 149, 151 151)'));
INSERT INTO t1 (g) VALUES (GeomFromText('LineString(148 148, 152 152)'));
......@@ -295,7 +295,7 @@ t2 CREATE TABLE `t2` (
`g` geometry NOT NULL,
PRIMARY KEY (`fid`),
SPATIAL KEY `g` (`g`)
) ENGINE=MARIA AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=DYNAMIC
) ENGINE=Aria AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=DYNAMIC
SELECT count(*) FROM t2;
count(*)
100
......
mysql-test/suite/maria/r/maria-gis-rtree-trans.result
View file @ e246077b
set storage_engine=maria;
set storage_engine=aria;
DROP TABLE IF EXISTS t1, t2;
CREATE TABLE t1 (
fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
......@@ -12,7 +12,7 @@ t1 CREATE TABLE `t1` (
`g` geometry NOT NULL,
PRIMARY KEY (`fid`),
SPATIAL KEY `g` (`g`)
) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=1
) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=1
INSERT INTO t1 (g) VALUES (GeomFromText('LineString(150 150, 150 150)'));
INSERT INTO t1 (g) VALUES (GeomFromText('LineString(149 149, 151 151)'));
INSERT INTO t1 (g) VALUES (GeomFromText('LineString(148 148, 152 152)'));
......@@ -295,7 +295,7 @@ t2 CREATE TABLE `t2` (
`g` geometry NOT NULL,
PRIMARY KEY (`fid`),
SPATIAL KEY `g` (`g`)
) ENGINE=MARIA AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=1
) ENGINE=Aria AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=1
SELECT count(*) FROM t2;
count(*)
100
......
mysql-test/suite/maria/r/maria-gis-rtree.result
View file @ e246077b
set storage_engine=maria;
set storage_engine=aria;
DROP TABLE IF EXISTS t1, t2;
CREATE TABLE t1 (
fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
......@@ -12,7 +12,7 @@ t1 CREATE TABLE `t1` (
`g` geometry NOT NULL,
PRIMARY KEY (`fid`),
SPATIAL KEY `g` (`g`)
) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0
) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0
INSERT INTO t1 (g) VALUES (GeomFromText('LineString(150 150, 150 150)'));
INSERT INTO t1 (g) VALUES (GeomFromText('LineString(149 149, 151 151)'));
INSERT INTO t1 (g) VALUES (GeomFromText('LineString(148 148, 152 152)'));
......@@ -295,7 +295,7 @@ t2 CREATE TABLE `t2` (
`g` geometry NOT NULL,
PRIMARY KEY (`fid`),
SPATIAL KEY `g` (`g`)
) ENGINE=MARIA AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0
) ENGINE=Aria AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0
SELECT count(*) FROM t2;
count(*)
100
......
mysql-test/suite/maria/r/maria-mvcc.result
View file @ e246077b
set global maria_page_checksum=1;
set global aria_page_checksum=1;
drop table if exists t1;
create table t1 (i int) engine=maria;
create table t1 (i int) engine=aria;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) DEFAULT NULL
) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
insert into t1 values (0);
lock tables t1 write concurrent;
insert into t1 values (1);
......@@ -151,7 +151,7 @@ select count(*) from t1;
count(*)
8
drop table t1;
CREATE TABLE t1 (fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, g GEOMETRY NOT NULL, SPATIAL KEY(g) ) transactional=1 row_format=page engine=maria;
CREATE TABLE t1 (fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, g GEOMETRY NOT NULL, SPATIAL KEY(g) ) transactional=1 row_format=page engine=aria;
lock tables t1 write concurrent, t1 as t2 write concurrent;
insert into t1 (fid,g) values (NULL,GeomFromText('LineString(0 0,1 1)'));
select fid from t1 as t2;
......
mysql-test/suite/maria/r/maria-no-logging.result
View file @ e246077b
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;
mysql-test/suite/maria/r/maria-partitioning.result
View file @ e246077b
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
......
mysql-test/suite/maria/r/maria-purge.result
View file @ e246077b
* 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;
mysql-test/suite/maria/r/maria-recover.result
View file @ e246077b
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;
mysql-test/suite/maria/r/maria-recovery-big.result
View file @ e246077b
set global maria_log_file_size=4294967295;
set global aria_log_file_size=4294967295;
drop database if exists mysqltest;
create database mysqltest;
use mysqltest;
* TEST of recovery with blobs
* shut down mysqld, removed logs, restarted it
create table t1 (a int, b longtext) engine=maria table_checksum=1;
create table t1 (a int, b longtext) engine=aria table_checksum=1;
* copied t1 for feeding_recovery
insert into t1 values (1,"123456789012345678901234567890"),(2,"09876543210987654321");
flush table t1;
......@@ -62,7 +62,7 @@ a length(b)
2 5
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* copied t1 back for feeding_recovery
* recovery happens
......
mysql-test/suite/maria/r/maria-recovery-bitmap.result
View file @ e246077b
......@@ -2,7 +2,7 @@ drop database if exists mysqltest;
create database mysqltest;
use mysqltest;
* shut down mysqld, removed logs, restarted it
create table t1 (a varchar(10000)) engine=maria;
create table t1 (a varchar(10000)) engine=aria;
* TEST of over-allocated bitmap not flushed by checkpoint
insert into t1 values ("bbbbbbb");
flush table t1;
......@@ -11,10 +11,10 @@ insert into t1 values ("bbbbbbb");
delete from t1 limit 1;
set session debug="+d,info,enter,exit,maria_over_alloc_bitmap";
insert into t1 values ("aaaaaaaaa");
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
SET SESSION debug="+d,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t1 extended;
......@@ -31,7 +31,7 @@ lock tables t1 write;
insert into t1 values (REPEAT('a', 6000));
SET SESSION debug="+d,maria_flush_bitmap,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t1 extended;
......
mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
View file @ e246077b
set global maria_log_file_size=4294967295;
set global aria_log_file_size=4294967295;
drop database if exists mysqltest;
create database mysqltest;
use mysqltest;
......@@ -8,12 +8,12 @@ line LINESTRING NOT NULL,
kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po',
name VARCHAR(32)
,SPATIAL key (line)
) transactional=1 row_format=page engine=maria;
) transactional=1 row_format=page engine=aria;
SHOW INDEX FROM t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 1 line 1 line A NULL 32 NULL SPATIAL
CREATE TABLE t2 (a VARCHAR(200), b TEXT, FULLTEXT (a,b)
) transactional=1 row_format=page engine=maria;
) transactional=1 row_format=page engine=aria;
SHOW INDEX FROM t2;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t2 1 a 1 a NULL NULL NULL NULL YES FULLTEXT
......@@ -27,7 +27,7 @@ flush table t1;
* copied t1 for comparison
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* copied t2 back for feeding_recovery
* copied t1 back for feeding_recovery
......@@ -53,7 +53,7 @@ flush table t1;
lock tables t1 write, t2 write;
SET SESSION debug="+d,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t2 extended;
......@@ -76,7 +76,7 @@ flush table t1;
lock tables t1 write, t2 write;
SET SESSION debug="+d,maria_flush_whole_page_cache,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t2 extended;
......@@ -99,7 +99,7 @@ flush table t1;
lock tables t1 write, t2 write;
SET SESSION debug="+d,maria_flush_states,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t2 extended;
......@@ -122,7 +122,7 @@ flush table t1;
lock tables t1 write, t2 write;
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t2 extended;
......@@ -140,7 +140,7 @@ ok
use mysqltest;
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t2 extended;
......
mysql-test/suite/maria/r/maria-recovery.result
View file @ e246077b
set global maria_log_file_size=4294967295;
set global aria_log_file_size=4294967295;
drop database if exists mysqltest;
create database mysqltest;
use mysqltest;
* shut down mysqld, removed logs, restarted it
create table t1 (a varchar(1000)) engine=maria;
create table t1 (a varchar(1000)) engine=aria;
* TEST of REDO: see if recovery can reconstruct if we give it an old table
* copied t1 for feeding_recovery
insert into t1 values ("00000000");
......@@ -11,7 +11,7 @@ flush table t1;
* copied t1 for comparison
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* copied t1 back for feeding_recovery
* recovery happens
......@@ -34,7 +34,7 @@ lock tables t1 write;
insert into t1 values ("aaaaaaaaa");
SET SESSION debug="+d,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t1 extended;
......@@ -55,7 +55,7 @@ lock tables t1 write;
insert into t1 values ("aaaaaaaaa");
SET SESSION debug="+d,maria_flush_whole_page_cache,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t1 extended;
......@@ -77,7 +77,7 @@ lock tables t1 write;
insert into t1 values ("aaaaaaaaa");
SET SESSION debug="+d,maria_flush_states,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t1 extended;
......@@ -100,7 +100,7 @@ lock tables t1 write;
insert into t1 values ("aaaaaaaaa");
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t1 extended;
......@@ -124,7 +124,7 @@ CREATE TABLE t1 (
i int,
b blob default NULL,
c varchar(6000) default NULL
) ENGINE=MARIA CHECKSUM=1;
) ENGINE=ARIA CHECKSUM=1;
* copied t1 for feeding_recovery
INSERT INTO t1 VALUES (1, REPEAT('a', 5000), REPEAT('b', 5000));
UPDATE t1 SET i=3, b=CONCAT(b,'c') WHERE i=1;
......@@ -135,7 +135,7 @@ flush table t1;
* copied t1 for comparison
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* copied t1 back for feeding_recovery
* recovery happens
......@@ -156,7 +156,7 @@ CREATE TABLE t1 (
i int auto_increment primary key,
c varchar(6),
key(c)
) ENGINE=MARIA;
) ENGINE=ARIA;
insert into t1 values(null,"b");
* copied t1 for feeding_recovery
insert into t1 values(null,"a"), (null,"c"), (null,"d");
......@@ -165,7 +165,7 @@ flush table t1;
* copied t1 for comparison
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* copied t1 back for feeding_recovery
* recovery happens
......@@ -183,7 +183,7 @@ t1 CREATE TABLE `t1` (
`c` varchar(6) DEFAULT NULL,
PRIMARY KEY (`i`),
KEY `c` (`c`)
) ENGINE=MARIA AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
) ENGINE=Aria AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
* TEST of UPDATE vs state.auto_increment
* copied t1 for feeding_recovery
update t1 set i=15 where c="a";
......@@ -191,7 +191,7 @@ flush table t1;
* copied t1 for comparison
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* copied t1 back for feeding_recovery
* recovery happens
......@@ -209,7 +209,7 @@ t1 CREATE TABLE `t1` (
`c` varchar(6) DEFAULT NULL,
PRIMARY KEY (`i`),
KEY `c` (`c`)
) ENGINE=MARIA AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
) ENGINE=Aria AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
* TEST of INSERT's rollback vs state.auto_increment
flush table t1;
* copied t1 for comparison
......@@ -217,7 +217,7 @@ lock tables t1 write;
insert into t1 values(null, "e");
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t1 extended;
......@@ -234,7 +234,7 @@ t1 CREATE TABLE `t1` (
`c` varchar(6) DEFAULT NULL,
PRIMARY KEY (`i`),
KEY `c` (`c`)
) ENGINE=MARIA AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
) ENGINE=Aria AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
insert into t1 values(null, "f");
drop table t1;
drop database mysqltest_for_feeding_recovery;
......
mysql-test/suite/maria/r/maria-recovery2.result
View file @ e246077b
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
......
mysql-test/suite/maria/r/maria-recovery3.result
View file @ e246077b
set global maria_log_file_size=4294967295;
set global aria_log_file_size=4294967295;
drop database if exists mysqltest;
create database mysqltest;
use mysqltest;
* shut down mysqld, removed logs, restarted it
* TEST of Checkpoint between writing the commit log record and committing in trnman
create table t1(a int primary key) engine=maria;
create table t1(a int primary key) engine=aria;
insert into t1 values(1);
flush table t1;
* copied t1 for comparison
set session debug="+d,maria_sleep_in_commit";
insert into t1 values(2);
set global maria_checkpoint_interval=1000;
set global aria_checkpoint_interval=1000;
delete from t1 where a=2;
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* recovery happens
check table t1 extended;
......@@ -29,11 +29,11 @@ drop table t1;
CREATE TABLE `t1` (
`blob` blob,
`blob_key` blob
) ENGINE=maria ROW_FORMAT=page
) ENGINE=aria ROW_FORMAT=page
;
* copied t1 for feeding_recovery
* compared t1 to old version
set global maria_checkpoint_interval=0;
set global aria_checkpoint_interval=0;
INSERT INTO `t1` VALUES (NULL,repeat('A',5198));
INSERT INTO `t1` VALUES (NULL,repeat('B',65535));
INSERT INTO `t1` VALUES (repeat('K',5198),repeat('L',2325));
......@@ -50,7 +50,7 @@ flush table t1;
* compared t1 to old version
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
* copied t1 back for feeding_recovery
* recovery happens
......@@ -63,9 +63,9 @@ ok
* compared t1 to old version
use mysqltest;
drop table t1;
create table t1 engine=maria select 1;
create table t1 engine=aria select 1;
* copied t1 for feeding_recovery
set global maria_checkpoint_interval=0;
set global aria_checkpoint_interval=0;
insert into t1 values(2);
truncate table t1;
flush table t1;
......
mysql-test/suite/maria/r/maria.result
View file @ e246077b
This diff is collapsed.
mysql-test/suite/maria/r/maria2.result
View file @ e246077b
......@@ -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;
......
mysql-test/suite/maria/r/maria3.result
View file @ e246077b
This diff is collapsed.
mysql-test/suite/maria/r/maria_notembedded.result
View file @ e246077b
set session storage_engine=maria;
set session storage_engine=aria;
create table t1 (a int) row_format=page;
insert delayed into t1 values(1);
ERROR HY000: DELAYED option not supported for table 't1'
......
mysql-test/suite/maria/r/maria_partition.result
View file @ e246077b
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
......
mysql-test/suite/maria/r/maria_showlog_error.result
View file @ e246077b
* shut down mysqld, removed logs, restarted it
show engine maria logs;
show engine aria logs;
Type Name Status
MARIA Size unknown ; maria_log.00000001 can't stat
Aria Size unknown ; aria_log.00000001 can't stat
* shut down mysqld, removed logs, restarted it
mysql-test/suite/maria/r/ps_maria.result
View file @ e246077b
......@@ -4,7 +4,7 @@ create table t1
(
a int, b varchar(30),
primary key(a)
) engine = 'MARIA' ;
) engine = 'ARIA' ;
create table t9
(
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
......@@ -17,7 +17,7 @@ c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
c29 longblob, c30 longtext, c31 enum('one', 'two', 'three'),
c32 set('monday', 'tuesday', 'wednesday'),
primary key(c1)
) engine = 'MARIA' ;
) engine = 'ARIA' ;
delete from t1 ;
insert into t1 values (1,'one');
insert into t1 values (2,'two');
......@@ -1166,7 +1166,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t9 ALL NULL NULL NULL NULL 2
drop table if exists t2 ;
create table t2 (s varchar(25), fulltext(s)) TRANSACTIONAL= 0
ENGINE = 'MARIA' ;
ENGINE = 'ARIA' ;
insert into t2 values ('Gravedigger'), ('Greed'),('Hollow Dogs') ;
commit ;
prepare stmt1 from ' select s from t2 where match (s) against (?) ' ;
......@@ -1352,7 +1352,7 @@ create table t2
(
a int, b varchar(30),
primary key(a)
) engine = 'MARIA' ;
) engine = 'ARIA' ;
insert into t2(a,b) select a, b from t1 ;
prepare stmt1 from 'update t1 set a=? where b=?
and a in (select ? from t2
......@@ -1542,7 +1542,7 @@ execute stmt1 using @arg00, @arg01;
ERROR 23000: Duplicate entry '82' for key 'PRIMARY'
drop table if exists t2 ;
create table t2 (id int auto_increment primary key)
ENGINE= 'MARIA' ;
ENGINE= 'ARIA' ;
prepare stmt1 from ' select last_insert_id() ' ;
insert into t2 values (NULL) ;
execute stmt1 ;
......
mysql-test/suite/maria/t/group_commit.test
View file @ e246077b
......@@ -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;
mysql-test/suite/maria/t/maria-autozerofill.test
View file @ e246077b
# Test to verify that auto-zerofilling happens when a table is
# imported from a different Maria instance
# imported from a different Aria instance
# can't restart in embedded
--source include/not_embedded.inc
......@@ -20,16 +20,16 @@ connection default;
use mysqltest;
--enable_reconnect
create table t1(a int) engine=maria;
create table t1(a int) engine=aria;
insert into t1 values(1);
flush table t1;
# Check that table is not zerofilled, not movable
let $MYSQLD_DATADIR= `select @@datadir`;
--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt
perl;
use strict;
use warnings;
my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/mariachk.txt";
my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/ariachk.txt";
open(FILE, "<", $fname) or die;
my @content= <FILE>;
print grep(/Status:.*(zerofilled|movable)/, @content);
......@@ -37,23 +37,23 @@ perl;
close FILE;
EOF
# this will remove control file, so change the uuid of the Maria
# this will remove control file, so change the uuid of the Aria
# instance, thus t1 will appear as imported from elsewhere.
-- source include/maria_empty_logs.inc
disable_ps_protocol; # see maria-recover.test
disable_ps_protocol; # see aria-recover.test
replace_regex /Table.*t1/t1/ ;
select * from t1;
enable_ps_protocol;
flush table t1;
# Check that table is auto-zerofilled, movable
--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt
perl;
use strict;
use warnings;
my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/mariachk.txt";
my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/ariachk.txt";
open(FILE, "<", $fname) or die;
my @content= <FILE>;
print grep(/Status:.*zerofilled/, @content);
......@@ -61,16 +61,16 @@ perl;
close FILE;
EOF
# this will attach t1 to the current Maria instance
# this will attach t1 to the current Aria instance
insert into t1 values(2);
flush table t1;
# Check that table is not zerofilled, not movable
--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/mariachk.txt
--exec $MARIA_CHK -dv $MYSQLD_DATADIR/mysqltest/t1 >$MYSQLTEST_VARDIR/tmp/ariachk.txt
perl;
use strict;
use warnings;
my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/mariachk.txt";
my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/ariachk.txt";
open(FILE, "<", $fname) or die;
my @content= <FILE>;
print grep(/Status:.*(zerofilled|movable)/, @content);
......
mysql-test/suite/maria/t/maria-big.test
View file @ e246077b
......@@ -9,7 +9,7 @@ connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connection root;
enable_info;
set storage_engine=maria;
set storage_engine=aria;
disable_warnings;
drop table if exists t1, t2;
enable_warnings;
......@@ -68,7 +68,7 @@ drop table t1;
# Set defaults back
--disable_result_log
--disable_query_log
set global maria_log_file_size=default;
set global aria_log_file_size=default;
set global max_allowed_packet=default;
--enable_result_log
--enable_query_log
mysql-test/suite/maria/t/maria-big2.test
View file @ e246077b
......@@ -5,7 +5,7 @@
# (CHECK TABLE said Invalid key block position: 15731098820608 key
# block size: 8192 file_length: 425984)
create table t2(id int,a varchar(255),b varchar(255),key(a))engine=maria row_format=dynamic transactional=0;
create table t2(id int,a varchar(255),b varchar(255),key(a))engine=aria row_format=dynamic transactional=0;
disable_query_log;
insert into t2(a,b) values ('zmysnptvgzljpaumbdhrzkmbhefugcyhncbl','urecietrsfhgusavxffpdszrfcpdqbwxzvygsuwammwunjhpxanvozwnngnnjbwfenjgosaixpccjyviiutzpxkwiecuprltzrpxvkrjnjqgsneniewbagpvwelajvnckbbkqpaicxor')
......
mysql-test/suite/maria/t/maria-connect.test
View file @ e246077b
......@@ -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
mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test
View file @ e246077b
-- source include/have_maria.inc
-- source include/have_geometry.inc
set storage_engine=maria;
set storage_engine=aria;
#
# test of rtree (using with spatial data)
......
mysql-test/suite/maria/t/maria-gis-rtree-trans.test
View file @ e246077b
# Because state.key_root is updated differently between transactional
# and non-trans tables, we have several maria-gis-rtree-* tests.
# and non-trans tables, we have several aria-gis-rtree-* tests.
-- source include/have_maria.inc
-- source include/have_geometry.inc
set storage_engine=maria;
set storage_engine=aria;
#
# test of rtree (using with spatial data)
......
mysql-test/suite/maria/t/maria-gis-rtree.test
View file @ e246077b
-- source include/have_maria.inc
-- source include/have_geometry.inc
set storage_engine=maria;
set storage_engine=aria;
#
# test of rtree (using with spatial data)
......
mysql-test/suite/maria/t/maria-mvcc.test
View file @ e246077b
......@@ -4,7 +4,7 @@
#
-- source include/have_maria.inc
set global maria_page_checksum=1;
set global aria_page_checksum=1;
--disable_warnings
drop table if exists t1;
......@@ -13,7 +13,7 @@ drop table if exists t1;
connect (con1,localhost,root,,);
connection con1;
create table t1 (i int) engine=maria;
create table t1 (i int) engine=aria;
show create table t1;
# versioning is disabled when table is empty, so insert a row
......@@ -94,7 +94,7 @@ drop table t1;
# Test count(*) for not versioned tables
#
CREATE TABLE t1 (fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, g GEOMETRY NOT NULL, SPATIAL KEY(g) ) transactional=1 row_format=page engine=maria;
CREATE TABLE t1 (fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, g GEOMETRY NOT NULL, SPATIAL KEY(g) ) transactional=1 row_format=page engine=aria;
lock tables t1 write concurrent, t1 as t2 write concurrent;
insert into t1 (fid,g) values (NULL,GeomFromText('LineString(0 0,1 1)'));
......
mysql-test/suite/maria/t/maria-no-logging.test
View file @ e246077b
......@@ -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
mysql-test/suite/maria/t/maria-partitioning.test
View file @ e246077b
#
# 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);
......
mysql-test/suite/maria/t/maria-preload.test
View file @ e246077b
......@@ -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
mysql-test/suite/maria/t/maria-purge.test
View file @ e246077b
......@@ -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
mysql-test/suite/maria/t/maria-recover-master.opt
View file @ e246077b
--loose-maria-recover=backup --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp
--loose-aria-recover=backup --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp
mysql-test/suite/maria/t/maria-recover.test
View file @ e246077b
# 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;
mysql-test/suite/maria/t/maria-recovery-big.test
View file @ e246077b
# Maria recovery test which cannot run in shared memory
# Aria recovery test which cannot run in shared memory
# because it generates too much data, or which takes a lot of time.
--source include/not_embedded.inc
......@@ -9,7 +9,7 @@
--source include/have_maria.inc
--source include/big_test.inc
set global maria_log_file_size=4294967295;
set global aria_log_file_size=4294967295;
--disable_warnings
drop database if exists mysqltest;
......@@ -33,7 +33,7 @@ use mysqltest;
--echo * TEST of recovery with blobs
-- source include/maria_empty_logs.inc
create table t1 (a int, b longtext) engine=maria table_checksum=1;
create table t1 (a int, b longtext) engine=aria table_checksum=1;
let $mms_tables=1;
-- source include/maria_make_snapshot_for_feeding_recovery.inc
insert into t1 values (1,"123456789012345678901234567890"),(2,"09876543210987654321");
......@@ -57,7 +57,7 @@ select a,length(b) from t1;
let $mvr_restore_old_snapshot=1;
let $mms_compare_physically=0;
let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
let $mvr_crash_statement= set global maria_checkpoint_interval=1;
let $mvr_crash_statement= set global aria_checkpoint_interval=1;
-- source include/maria_verify_recovery.inc
drop table t1;
......
mysql-test/suite/maria/t/maria-recovery-bitmap.test
View file @ e246077b
# Tests of Maria's recovery of the bitmap pages
# Tests of Aria's recovery of the bitmap pages
--source include/not_embedded.inc
# Don't test this under valgrind, memory leaks will occur as we crash
......@@ -25,14 +25,14 @@ use mysqltest;
-- source include/maria_empty_logs.inc
let $mms_tables=1;
create table t1 (a varchar(10000)) engine=maria;
create table t1 (a varchar(10000)) engine=aria;
# we want recovery to use the tables as they were at time of crash
let $mvr_restore_old_snapshot=0;
# UNDO phase prevents physical comparison, normally,
# so we'll only use checksums to compare.
let $mms_compare_physically=0;
let $mvr_crash_statement= set global maria_checkpoint_interval=1;
let $mvr_crash_statement= set global aria_checkpoint_interval=1;
--echo * TEST of over-allocated bitmap not flushed by checkpoint
let $mvr_debug_option="+d,maria_crash";
......@@ -45,7 +45,7 @@ insert into t1 values ("bbbbbbb");
insert into t1 values ("bbbbbbb");
delete from t1 limit 1;
# Use a separate connection here. The reason is that we leave a dangling
# --send on the connection during maria_verify_recovery.inc, which makes that
# --send on the connection during aria_verify_recovery.inc, which makes that
# script fail if it were to try to use that connection before --reap.
connect (extra, localhost, root,,mysqltest,,);
set session debug="+d,info,enter,exit,maria_over_alloc_bitmap";
......@@ -59,7 +59,7 @@ sleep 5;
# bitmap page; as REDO-UNDO was not written, bitmap and data page
# would be inconsistent. Correct checkpoint will wait until UNDO is
# written.
set global maria_checkpoint_interval=1;
set global aria_checkpoint_interval=1;
-- source include/maria_verify_recovery.inc
connection default;
......
mysql-test/suite/maria/t/maria-recovery-master.opt
View file @ e246077b
--skip-stack-trace --skip-core-file --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp
--skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp
mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
View file @ e246077b
......@@ -7,7 +7,7 @@
--source include/have_debug.inc
--source include/have_maria.inc
set global maria_log_file_size=4294967295;
set global aria_log_file_size=4294967295;
let $MARIA_LOG=.;
--disable_warnings
......@@ -34,10 +34,10 @@ CREATE TABLE t1 (
kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po',
name VARCHAR(32)
,SPATIAL key (line)
) transactional=1 row_format=page engine=maria;
) transactional=1 row_format=page engine=aria;
SHOW INDEX FROM t1;
CREATE TABLE t2 (a VARCHAR(200), b TEXT, FULLTEXT (a,b)
) transactional=1 row_format=page engine=maria;
) transactional=1 row_format=page engine=aria;
SHOW INDEX FROM t2;
let $query1= INSERT INTO t1 (name, kind, line) VALUES
......@@ -113,7 +113,7 @@ while($1)
let $mvr_restore_old_snapshot=1;
let $mms_compare_physically=0;
let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
let $mvr_crash_statement= set global maria_checkpoint_interval=1;
let $mvr_crash_statement= set global aria_checkpoint_interval=1;
# the script below will trigger recovery and compare checksums
-- source include/maria_verify_recovery.inc
......@@ -132,7 +132,7 @@ let $mvr_restore_old_snapshot=0;
# UNDO phase prevents physical comparison, normally,
# so we'll only use checksums to compare.
let $mms_compare_physically=0;
let $mvr_crash_statement= set global maria_checkpoint_interval=1;
let $mvr_crash_statement= set global aria_checkpoint_interval=1;
# Note that we don't remove logs between iterations. Test is
# cumulative (each new recovery processes more log records than the previous).
......
mysql-test/suite/maria/t/maria-recovery.test
View file @ e246077b
......@@ -5,7 +5,7 @@
--source include/have_debug.inc
--source include/have_maria.inc
set global maria_log_file_size=4294967295;
set global aria_log_file_size=4294967295;
let $MARIA_LOG=../../tmp;
--disable_warnings
......@@ -27,7 +27,7 @@ use mysqltest;
# A sample test
-- source include/maria_empty_logs.inc
let $mms_tables=1;
create table t1 (a varchar(1000)) engine=maria;
create table t1 (a varchar(1000)) engine=aria;
--echo * TEST of REDO: see if recovery can reconstruct if we give it an old table
......@@ -42,7 +42,7 @@ let $mvr_restore_old_snapshot=1;
# produce a physically identical table.
let $mms_compare_physically=1;
let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
let $mvr_crash_statement= set global maria_checkpoint_interval=1;
let $mvr_crash_statement= set global aria_checkpoint_interval=1;
# the script below will trigger recovery and compare checksums
-- source include/maria_verify_recovery.inc
let $mms_compare_physically=0;
......@@ -63,7 +63,7 @@ let $mvr_restore_old_snapshot=0;
# UNDO phase prevents physical comparison, normally,
# so we'll only use checksums to compare.
let $mms_compare_physically=0;
let $mvr_crash_statement= set global maria_checkpoint_interval=1;
let $mvr_crash_statement= set global aria_checkpoint_interval=1;
# Note that we don't remove logs between iterations. Test is
# cumulative (each new recovery processes more log records than the previous).
......@@ -131,7 +131,7 @@ CREATE TABLE t1 (
i int,
b blob default NULL,
c varchar(6000) default NULL
) ENGINE=MARIA CHECKSUM=1;
) ENGINE=ARIA CHECKSUM=1;
-- source include/maria_make_snapshot_for_feeding_recovery.inc
INSERT INTO t1 VALUES (1, REPEAT('a', 5000), REPEAT('b', 5000));
UPDATE t1 SET i=3, b=CONCAT(b,'c') WHERE i=1;
......@@ -141,7 +141,7 @@ SELECT LENGTH(b) FROM t1 WHERE i=3;
let $mvr_restore_old_snapshot=1;
let $mms_compare_physically=0;
let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
let $mvr_crash_statement= set global maria_checkpoint_interval=1;
let $mvr_crash_statement= set global aria_checkpoint_interval=1;
-- source include/maria_verify_recovery.inc
SELECT LENGTH(b) FROM t1 WHERE i=3;
drop table t1;
......@@ -154,7 +154,7 @@ CREATE TABLE t1 (
i int auto_increment primary key,
c varchar(6),
key(c)
) ENGINE=MARIA;
) ENGINE=ARIA;
insert into t1 values(null,"b");
-- source include/maria_make_snapshot_for_feeding_recovery.inc
insert into t1 values(null,"a"), (null,"c"), (null,"d");
......@@ -164,7 +164,7 @@ delete from t1 where c="d";
let $mvr_restore_old_snapshot=1;
let $mms_compare_physically=0;
let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
let $mvr_crash_statement= set global maria_checkpoint_interval=1;
let $mvr_crash_statement= set global aria_checkpoint_interval=1;
-- source include/maria_verify_recovery.inc
show create table t1;
......@@ -176,7 +176,7 @@ update t1 set i=15 where c="a";
let $mvr_restore_old_snapshot=1;
let $mms_compare_physically=0;
let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
let $mvr_crash_statement= set global maria_checkpoint_interval=1;
let $mvr_crash_statement= set global aria_checkpoint_interval=1;
-- source include/maria_verify_recovery.inc
show create table t1;
......@@ -187,7 +187,7 @@ show create table t1;
let $mvr_restore_old_snapshot=0;
let $mms_compare_physically=0;
let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
let $mvr_crash_statement= set global maria_checkpoint_interval=1;
let $mvr_crash_statement= set global aria_checkpoint_interval=1;
lock tables t1 write;
insert into t1 values(null, "e");
-- source include/maria_verify_recovery.inc
......
mysql-test/suite/maria/t/maria-recovery2-master.opt
View file @ e246077b
--skip-stack-trace --skip-core-file --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp --myisam-recover=
--skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp --myisam-recover=
mysql-test/suite/maria/t/maria-recovery2.test
View file @ e246077b
......@@ -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
......
mysql-test/suite/maria/t/maria-recovery3-master.opt
View file @ e246077b
--skip-stack-trace --skip-core-file --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp
--skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp
mysql-test/suite/maria/t/maria-recovery3.test
View file @ e246077b
......@@ -5,7 +5,7 @@
--source include/have_debug.inc
--source include/have_maria.inc
set global maria_log_file_size=4294967295;
set global aria_log_file_size=4294967295;
let $MARIA_LOG=../../tmp;
--disable_warnings
......@@ -28,7 +28,7 @@ let $mms_tables=1;
let $mvr_restore_old_snapshot=0;
let $mms_compare_physically=0;
let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash";
let $mvr_crash_statement= set global maria_checkpoint_interval=1;
let $mvr_crash_statement= set global aria_checkpoint_interval=1;
-- source include/maria_empty_logs.inc
......@@ -39,7 +39,7 @@ let $mvr_restore_old_snapshot=0;
# UNDO phase prevents physical comparison, normally,
# so we'll only use checksums to compare.
let $mms_compare_physically=0;
create table t1(a int primary key) engine=maria;
create table t1(a int primary key) engine=aria;
insert into t1 values(1);
-- source include/maria_make_snapshot_for_comparison.inc
set session debug="+d,maria_sleep_in_commit";
......@@ -49,7 +49,7 @@ sleep 1;
# but not yet called trnman_commit(), so for checkpoint it's not
# committed.
connection admin;
set global maria_checkpoint_interval=1000; # force a checkpoint
set global aria_checkpoint_interval=1000; # force a checkpoint
connection default;
reap; # end of INSERT
delete from t1 where a=2;
......@@ -64,17 +64,17 @@ drop table t1;
# before checkpoint happens, test should still pass (though it won't
# reproduce the conditions of the bug).
# Test for BUG#41493 Maria: two recovery failures (wrong logging of BLOB pages)
# Test for BUG#41493 Aria: two recovery failures (wrong logging of BLOB pages)
--echo * TEST of logging of BLOBs
let $mvr_restore_old_snapshot=1;
let $mms_compare_physically=1;
CREATE TABLE `t1` (
`blob` blob,
`blob_key` blob
) ENGINE=maria ROW_FORMAT=page
) ENGINE=aria ROW_FORMAT=page
;
-- source include/maria_make_snapshot_for_feeding_recovery.inc
set global maria_checkpoint_interval=0; # no checkpoints
set global aria_checkpoint_interval=0; # no checkpoints
INSERT INTO `t1` VALUES (NULL,repeat('A',5198));
INSERT INTO `t1` VALUES (NULL,repeat('B',65535));
INSERT INTO `t1` VALUES (repeat('K',5198),repeat('L',2325));
......@@ -88,14 +88,14 @@ check table t1 extended;
-- source include/maria_verify_recovery.inc
drop table t1;
# Test for BUG#42112 "Maria: recovery failure (pushbuild2) Assertion
# Test for BUG#42112 "Aria: recovery failure (pushbuild2) Assertion
# `rownr == 0 && new_page' failed"
let $mvr_restore_old_snapshot=0;
let $mms_compare_physically=0;
create table t1 engine=maria select 1;
create table t1 engine=aria select 1;
-- source include/maria_make_snapshot_for_feeding_recovery.inc
set global maria_checkpoint_interval=0; # no checkpoints
set global aria_checkpoint_interval=0; # no checkpoints
insert into t1 values(2);
truncate table t1;
-- source include/maria_make_snapshot_for_comparison.inc
......
mysql-test/suite/maria/t/maria.test
View file @ e246077b
This diff is collapsed.
mysql-test/suite/maria/t/maria2.test
View file @ e246077b
......@@ -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;
......
mysql-test/suite/maria/t/maria3.test
View file @ e246077b
This diff is collapsed.
mysql-test/suite/maria/t/maria_notembedded.test
View file @ e246077b
......@@ -4,7 +4,7 @@
-- source include/have_maria.inc
let $default_engine=`select @@session.storage_engine`;
set session storage_engine=maria;
set session storage_engine=aria;
# Verify that INSERT DELAYED is disabled only for transactional tables
# ("embedded" server translates them to plain INSERT)
......
mysql-test/suite/maria/t/maria_partition.test
View file @ e246077b
# 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
mysql-test/suite/maria/t/maria_showlog_error.test
View file @ e246077b
......@@ -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
......
mysql-test/suite/maria/t/optimize.test
View file @ e246077b
This diff is collapsed.
mysql-test/suite/maria/t/ps_maria.test
View file @ e246077b
###############################################
# #
# Prepared Statements test on MARIA tables #
# Prepared Statements test on ARIA tables #
# #
###############################################
......@@ -12,7 +12,7 @@
use test;
let $type= 'MARIA' ;
let $type= 'ARIA' ;
-- source include/ps_create.inc
-- source include/ps_renew.inc
......@@ -47,6 +47,6 @@ drop table t1, t9;
--disable_result_log
--disable_query_log
set global maria_log_file_size=default;
set global aria_log_file_size=default;
--enable_result_log
--enable_query_log
mysql-test/suite/parts/t/partition_alter2_1_maria.test
View file @ e246077b
......@@ -3,7 +3,7 @@
# #
# Purpose: #
# Tests around Alter column used in partitioning function #
# MARIA branch #
# Aria branch #
# #
#------------------------------------------------------------------------------#
# Original Author: mleich #
......@@ -14,7 +14,7 @@
################################################################################
#
# NOTE: PLEASE DO NOT ADD NOT MARIA SPECIFIC TESTCASES HERE !
# NOTE: PLEASE DO NOT ADD NOT Aria SPECIFIC TESTCASES HERE !
# TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN
# THE SOURCED FILES ONLY.
#
......@@ -54,14 +54,14 @@ let $more_pk_ui_tests= 0;
##### Storage engine to be tested
--source include/have_maria.inc
let $engine= 'MARIA';
let $engine= 'Aria';
##### Execute the test of "table" files
# MARIA has files per PK, UI, ...
# Aria has files per PK, UI, ...
let $do_file_tests= 1;
##### Execute PRIMARY KEY tests #####
# AFAIK MARIA treats PRIMARY KEYs like UNIQUE INDEXes
# AFAIK Aria treats PRIMARY KEYs like UNIQUE INDEXes
let $do_pk_tests= 0;
##### Assign a big number smaller than the maximum value for partitions #####
......
mysql-test/suite/parts/t/partition_auto_increment_maria.test
View file @ e246077b
......@@ -27,7 +27,7 @@
##### Storage engine to be tested
--source include/have_maria.inc
let $engine= 'MARIA';
let $engine= 'Aria';
#------------------------------------------------------------------------------#
# Execute the tests to be applied to all storage engines
......
mysql-test/t/bug46080-master.opt
View file @ e246077b
--skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=20000000 --loose-maria-pagecache-buffer-size=1M
--skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=20000000 --loose-aria-pagecache-buffer-size=1M
mysql-test/t/create.test
View file @ e246077b
This diff is collapsed.
scripts/make_binary_distribution.sh
View file @ e246077b
This diff is collapsed.
scripts/make_win_bin_dist
View file @ e246077b
......@@ -141,7 +141,7 @@ fi
# Copy executables, and client DLL
# ----------------------------------------------------------------------
MYISAM_BINARIES="myisamchk myisamlog myisampack myisam_ftdump"
MARIA_BINARIES="maria_chk maria_dump_log maria_ftdump maria_pack maria_read_log"
MARIA_BINARIES="aria_chk aria_dump_log aria_ftdump aria_pack aria_read_log"
mkdir $DESTDIR
mkdir $DESTDIR/bin
cp client/$TARGET/*.exe $DESTDIR/bin/
......
sql/handler.cc
View file @ e246077b
This diff is collapsed.
sql/mysqld.cc
View file @ e246077b
This diff is collapsed.
sql/set_var.cc
View file @ e246077b
This diff is collapsed.
sql/sql_class.h
View file @ e246077b
This diff is collapsed.
sql/sql_parse.cc
View file @ e246077b
This diff is collapsed.
sql/sql_select.cc
View file @ e246077b
This diff is collapsed.
storage/maria/CMakeLists.txt
View file @ e246077b
This diff is collapsed.
storage/maria/Makefile.am
View file @ e246077b
This diff is collapsed.
storage/maria/ha_maria.cc
View file @ e246077b
This diff is collapsed.
storage/maria/ha_maria.h
View file @ e246077b
This diff is collapsed.
storage/maria/ma_check.c
View file @ e246077b
This diff is collapsed.
storage/maria/ma_check_standalone.h
View file @ e246077b
This diff is collapsed.
storage/maria/ma_checkpoint.h
View file @ e246077b
This diff is collapsed.
storage/maria/ma_control_file.c
View file @ e246077b
This diff is collapsed.
storage/maria/ma_control_file.h
View file @ e246077b
This diff is collapsed.
storage/maria/ma_create.c
View file @ e246077b
This diff is collapsed.
storage/maria/ma_loghandler.c
View file @ e246077b
This diff is collapsed.
storage/maria/ma_recovery.c
View file @ e246077b
This diff is collapsed.
storage/maria/ma_sort.c
View file @ e246077b
This diff is collapsed.
storage/maria/ma_test_force_start.pl
View file @ e246077b
This diff is collapsed.
storage/maria/maria_chk.c
View file @ e246077b
This diff is collapsed.
storage/maria/maria_ftdump.c
View file @ e246077b
This diff is collapsed.
storage/maria/maria_pack.c
View file @ e246077b
This diff is collapsed.
storage/maria/maria_read_log.c
View file @ e246077b
This diff is collapsed.
storage/maria/plug.in
View file @ e246077b
This diff is collapsed.
storage/maria/unittest/Makefile.am
View file @ e246077b
This diff is collapsed.
storage/maria/unittest/ma_control_file-t.c
View file @ e246077b
This diff is collapsed.
storage/maria/unittest/ma_test_all-t
View file @ e246077b
This diff is collapsed.
storage/maria/unittest/ma_test_recovery.pl
View file @ e246077b
This diff is collapsed.
support-files/compiler_warnings.supp
View file @ e246077b
This diff is collapsed.
win/configure-mariadb.sh
View file @ e246077b
This diff is collapsed.
win/configure.js
View file @ e246077b
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7