database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

rename maria to aria

Browse Source
This commit is contained in:
Sergei Golubchik
2010-09-12 18:40:01 +02:00
parent fa5baa12bc
commit e246077bcf
122 changed files with 2619 additions and 2616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mysql-test/lib/v1/mysql-test-run.pl
View File

@@ -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 )
{