From 53375573e32e77676f4a4338099e44698b1bfb45 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 19 Apr 2013 07:07:06 +0200 Subject: [PATCH] small mtr cleanup and move the connect suite into storage/connect/ --- mysql-test/lib/My/ConfigFactory.pm | 2 +- mysql-test/mysql-test-run.pl | 4 ++-- .../connect/mysql-test}/connect/r/bin.result | 0 .../connect/mysql-test}/connect/r/csv.result | 0 .../connect/mysql-test}/connect/r/dbf.result | 0 .../connect/mysql-test}/connect/r/dir.result | 0 .../connect/mysql-test}/connect/r/fix.result | 0 .../connect/mysql-test}/connect/r/fmt.result | 0 .../connect/mysql-test}/connect/r/general.result | 0 .../connect/mysql-test}/connect/r/index.result | 0 .../connect/mysql-test}/connect/r/ini.result | 0 .../connect/mysql-test}/connect/r/mysql.result | 0 .../connect/mysql-test}/connect/r/null.result | 0 .../mysql-test}/connect/r/odbc_sqlite3.result | 0 .../connect/mysql-test}/connect/r/odbc_xls.result | 0 .../mysql-test}/connect/r/secure_file_priv.result | 0 .../connect/mysql-test}/connect/r/tbl.result | 0 .../connect/mysql-test}/connect/r/upd.result | 0 .../connect/mysql-test}/connect/r/vec.result | 0 .../connect/mysql-test}/connect/r/xml.result | 0 .../mysql-test}/connect/std_data/Testbal.dat | Bin .../connect/mysql-test}/connect/std_data/boys.txt | 0 .../mysql-test}/connect/std_data/boyswin.txt | 0 .../mysql-test}/connect/std_data/contact.ini | 0 .../mysql-test}/connect/std_data/contacts.xls | Bin .../connect/mysql-test}/connect/std_data/cp1251.xml | 0 .../connect/mysql-test}/connect/std_data/dept.dat | 0 .../connect/mysql-test}/connect/std_data/emp.txt | 0 .../mysql-test}/connect/std_data/employee.dat | 0 .../connect/mysql-test}/connect/std_data/funny.txt | 0 .../connect/mysql-test}/connect/std_data/funny2.txt | 0 .../connect/mysql-test}/connect/std_data/latin1.xml | 0 .../connect/mysql-test}/connect/std_data/nocs.xml | 0 .../connect/mysql-test}/connect/std_data/people.csv | 0 .../connect/mysql-test}/connect/std_data/sexe.csv | 0 .../connect/mysql-test}/connect/std_data/sitmat.csv | 0 .../mysql-test}/connect/std_data/test.sqlite3 | Bin .../mysql-test}/connect/std_data/xsample.xml | 0 .../connect/mysql-test}/connect/suite.opt | 0 .../connect/mysql-test}/connect/suite.pm | 0 .../connect/mysql-test}/connect/t/bin.test | 2 +- .../connect/mysql-test}/connect/t/csv.test | 2 +- .../connect/mysql-test}/connect/t/dbf.test | 0 .../connect/mysql-test}/connect/t/dir.test | 4 ++-- .../connect/mysql-test}/connect/t/fix.test | 6 +++--- .../connect/mysql-test}/connect/t/fmt.test | 4 ++-- .../connect/mysql-test}/connect/t/general.test | 0 .../connect/mysql-test}/connect/t/grant.inc | 0 .../connect/mysql-test}/connect/t/index.test | 6 +++--- .../connect/mysql-test}/connect/t/ini.test | 2 +- .../connect/mysql-test}/connect/t/mysql.test | 0 .../connect/mysql-test}/connect/t/null.test | 0 .../connect/mysql-test}/connect/t/odbc_sqlite3.test | 2 +- .../connect/mysql-test}/connect/t/odbc_xls.test | 2 +- .../connect/t/secure_file_priv-master.opt | 0 .../mysql-test}/connect/t/secure_file_priv.test | 0 .../connect/mysql-test}/connect/t/tbl.test | 0 .../connect/mysql-test}/connect/t/upd.test | 2 +- .../connect/mysql-test}/connect/t/vec.test | 0 .../connect/mysql-test}/connect/t/xml.test | 9 +++++---- 60 files changed, 24 insertions(+), 23 deletions(-) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/bin.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/csv.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/dbf.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/dir.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/fix.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/fmt.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/general.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/index.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/ini.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/mysql.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/null.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/odbc_sqlite3.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/odbc_xls.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/secure_file_priv.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/tbl.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/upd.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/vec.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/r/xml.result (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/Testbal.dat (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/boys.txt (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/boyswin.txt (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/contact.ini (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/contacts.xls (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/cp1251.xml (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/dept.dat (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/emp.txt (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/employee.dat (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/funny.txt (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/funny2.txt (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/latin1.xml (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/nocs.xml (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/people.csv (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/sexe.csv (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/sitmat.csv (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/test.sqlite3 (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/std_data/xsample.xml (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/suite.opt (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/suite.pm (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/bin.test (95%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/csv.test (98%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/dbf.test (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/dir.test (94%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/fix.test (90%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/fmt.test (92%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/general.test (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/grant.inc (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/index.test (88%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/ini.test (98%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/mysql.test (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/null.test (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/odbc_sqlite3.test (97%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/odbc_xls.test (88%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/secure_file_priv-master.opt (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/secure_file_priv.test (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/tbl.test (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/upd.test (94%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/vec.test (100%) rename {mysql-test/suite => storage/connect/mysql-test}/connect/t/xml.test (95%) diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index e79d97e045e..4e8507a5c4a 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -37,7 +37,7 @@ sub add_opt_values { # add auto-options $config->insert('OPT', 'port' => sub { fix_port($self, $config) }); - $config->insert('mysqld', "loose-skip-$_" => undef) for (@::optional_plugins); + $config->insert('mysqld', "loose-skip-plugin-$_" => undef) for (@::optional_plugins); } my @pre_rules= diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index f7f4530a6c5..53d54ec6425 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1925,7 +1925,7 @@ sub collect_mysqld_features { # here we want to detect all not mandatory plugins # they are listed in the --help output as # --archive[=name] Enable or disable ARCHIVE plugin. Possible values are ON, OFF, FORCE (don't start if the plugin fails to load). - push @optional_plugins, "plugin-$1" + push @optional_plugins, $1 if /^ --([-a-z0-9]+)\[=name\] +Enable or disable \w+ plugin. Possible values are ON, OFF, FORCE/; next; } @@ -3450,7 +3450,7 @@ sub mysql_install_db { mtr_add_arg($args, "--basedir=%s", $install_basedir); mtr_add_arg($args, "--datadir=%s", $install_datadir); mtr_add_arg($args, "--default-storage-engine=myisam"); - mtr_add_arg($args, "--skip-$_") for @optional_plugins; + mtr_add_arg($args, "--skip-plugin-$_") for @optional_plugins; # starting from 10.0 bootstrap scripts require InnoDB mtr_add_arg($args, "--loose-innodb"); mtr_add_arg($args, "--disable-sync-frm"); diff --git a/mysql-test/suite/connect/r/bin.result b/storage/connect/mysql-test/connect/r/bin.result similarity index 100% rename from mysql-test/suite/connect/r/bin.result rename to storage/connect/mysql-test/connect/r/bin.result diff --git a/mysql-test/suite/connect/r/csv.result b/storage/connect/mysql-test/connect/r/csv.result similarity index 100% rename from mysql-test/suite/connect/r/csv.result rename to storage/connect/mysql-test/connect/r/csv.result diff --git a/mysql-test/suite/connect/r/dbf.result b/storage/connect/mysql-test/connect/r/dbf.result similarity index 100% rename from mysql-test/suite/connect/r/dbf.result rename to storage/connect/mysql-test/connect/r/dbf.result diff --git a/mysql-test/suite/connect/r/dir.result b/storage/connect/mysql-test/connect/r/dir.result similarity index 100% rename from mysql-test/suite/connect/r/dir.result rename to storage/connect/mysql-test/connect/r/dir.result diff --git a/mysql-test/suite/connect/r/fix.result b/storage/connect/mysql-test/connect/r/fix.result similarity index 100% rename from mysql-test/suite/connect/r/fix.result rename to storage/connect/mysql-test/connect/r/fix.result diff --git a/mysql-test/suite/connect/r/fmt.result b/storage/connect/mysql-test/connect/r/fmt.result similarity index 100% rename from mysql-test/suite/connect/r/fmt.result rename to storage/connect/mysql-test/connect/r/fmt.result diff --git a/mysql-test/suite/connect/r/general.result b/storage/connect/mysql-test/connect/r/general.result similarity index 100% rename from mysql-test/suite/connect/r/general.result rename to storage/connect/mysql-test/connect/r/general.result diff --git a/mysql-test/suite/connect/r/index.result b/storage/connect/mysql-test/connect/r/index.result similarity index 100% rename from mysql-test/suite/connect/r/index.result rename to storage/connect/mysql-test/connect/r/index.result diff --git a/mysql-test/suite/connect/r/ini.result b/storage/connect/mysql-test/connect/r/ini.result similarity index 100% rename from mysql-test/suite/connect/r/ini.result rename to storage/connect/mysql-test/connect/r/ini.result diff --git a/mysql-test/suite/connect/r/mysql.result b/storage/connect/mysql-test/connect/r/mysql.result similarity index 100% rename from mysql-test/suite/connect/r/mysql.result rename to storage/connect/mysql-test/connect/r/mysql.result diff --git a/mysql-test/suite/connect/r/null.result b/storage/connect/mysql-test/connect/r/null.result similarity index 100% rename from mysql-test/suite/connect/r/null.result rename to storage/connect/mysql-test/connect/r/null.result diff --git a/mysql-test/suite/connect/r/odbc_sqlite3.result b/storage/connect/mysql-test/connect/r/odbc_sqlite3.result similarity index 100% rename from mysql-test/suite/connect/r/odbc_sqlite3.result rename to storage/connect/mysql-test/connect/r/odbc_sqlite3.result diff --git a/mysql-test/suite/connect/r/odbc_xls.result b/storage/connect/mysql-test/connect/r/odbc_xls.result similarity index 100% rename from mysql-test/suite/connect/r/odbc_xls.result rename to storage/connect/mysql-test/connect/r/odbc_xls.result diff --git a/mysql-test/suite/connect/r/secure_file_priv.result b/storage/connect/mysql-test/connect/r/secure_file_priv.result similarity index 100% rename from mysql-test/suite/connect/r/secure_file_priv.result rename to storage/connect/mysql-test/connect/r/secure_file_priv.result diff --git a/mysql-test/suite/connect/r/tbl.result b/storage/connect/mysql-test/connect/r/tbl.result similarity index 100% rename from mysql-test/suite/connect/r/tbl.result rename to storage/connect/mysql-test/connect/r/tbl.result diff --git a/mysql-test/suite/connect/r/upd.result b/storage/connect/mysql-test/connect/r/upd.result similarity index 100% rename from mysql-test/suite/connect/r/upd.result rename to storage/connect/mysql-test/connect/r/upd.result diff --git a/mysql-test/suite/connect/r/vec.result b/storage/connect/mysql-test/connect/r/vec.result similarity index 100% rename from mysql-test/suite/connect/r/vec.result rename to storage/connect/mysql-test/connect/r/vec.result diff --git a/mysql-test/suite/connect/r/xml.result b/storage/connect/mysql-test/connect/r/xml.result similarity index 100% rename from mysql-test/suite/connect/r/xml.result rename to storage/connect/mysql-test/connect/r/xml.result diff --git a/mysql-test/suite/connect/std_data/Testbal.dat b/storage/connect/mysql-test/connect/std_data/Testbal.dat similarity index 100% rename from mysql-test/suite/connect/std_data/Testbal.dat rename to storage/connect/mysql-test/connect/std_data/Testbal.dat diff --git a/mysql-test/suite/connect/std_data/boys.txt b/storage/connect/mysql-test/connect/std_data/boys.txt similarity index 100% rename from mysql-test/suite/connect/std_data/boys.txt rename to storage/connect/mysql-test/connect/std_data/boys.txt diff --git a/mysql-test/suite/connect/std_data/boyswin.txt b/storage/connect/mysql-test/connect/std_data/boyswin.txt similarity index 100% rename from mysql-test/suite/connect/std_data/boyswin.txt rename to storage/connect/mysql-test/connect/std_data/boyswin.txt diff --git a/mysql-test/suite/connect/std_data/contact.ini b/storage/connect/mysql-test/connect/std_data/contact.ini similarity index 100% rename from mysql-test/suite/connect/std_data/contact.ini rename to storage/connect/mysql-test/connect/std_data/contact.ini diff --git a/mysql-test/suite/connect/std_data/contacts.xls b/storage/connect/mysql-test/connect/std_data/contacts.xls similarity index 100% rename from mysql-test/suite/connect/std_data/contacts.xls rename to storage/connect/mysql-test/connect/std_data/contacts.xls diff --git a/mysql-test/suite/connect/std_data/cp1251.xml b/storage/connect/mysql-test/connect/std_data/cp1251.xml similarity index 100% rename from mysql-test/suite/connect/std_data/cp1251.xml rename to storage/connect/mysql-test/connect/std_data/cp1251.xml diff --git a/mysql-test/suite/connect/std_data/dept.dat b/storage/connect/mysql-test/connect/std_data/dept.dat similarity index 100% rename from mysql-test/suite/connect/std_data/dept.dat rename to storage/connect/mysql-test/connect/std_data/dept.dat diff --git a/mysql-test/suite/connect/std_data/emp.txt b/storage/connect/mysql-test/connect/std_data/emp.txt similarity index 100% rename from mysql-test/suite/connect/std_data/emp.txt rename to storage/connect/mysql-test/connect/std_data/emp.txt diff --git a/mysql-test/suite/connect/std_data/employee.dat b/storage/connect/mysql-test/connect/std_data/employee.dat similarity index 100% rename from mysql-test/suite/connect/std_data/employee.dat rename to storage/connect/mysql-test/connect/std_data/employee.dat diff --git a/mysql-test/suite/connect/std_data/funny.txt b/storage/connect/mysql-test/connect/std_data/funny.txt similarity index 100% rename from mysql-test/suite/connect/std_data/funny.txt rename to storage/connect/mysql-test/connect/std_data/funny.txt diff --git a/mysql-test/suite/connect/std_data/funny2.txt b/storage/connect/mysql-test/connect/std_data/funny2.txt similarity index 100% rename from mysql-test/suite/connect/std_data/funny2.txt rename to storage/connect/mysql-test/connect/std_data/funny2.txt diff --git a/mysql-test/suite/connect/std_data/latin1.xml b/storage/connect/mysql-test/connect/std_data/latin1.xml similarity index 100% rename from mysql-test/suite/connect/std_data/latin1.xml rename to storage/connect/mysql-test/connect/std_data/latin1.xml diff --git a/mysql-test/suite/connect/std_data/nocs.xml b/storage/connect/mysql-test/connect/std_data/nocs.xml similarity index 100% rename from mysql-test/suite/connect/std_data/nocs.xml rename to storage/connect/mysql-test/connect/std_data/nocs.xml diff --git a/mysql-test/suite/connect/std_data/people.csv b/storage/connect/mysql-test/connect/std_data/people.csv similarity index 100% rename from mysql-test/suite/connect/std_data/people.csv rename to storage/connect/mysql-test/connect/std_data/people.csv diff --git a/mysql-test/suite/connect/std_data/sexe.csv b/storage/connect/mysql-test/connect/std_data/sexe.csv similarity index 100% rename from mysql-test/suite/connect/std_data/sexe.csv rename to storage/connect/mysql-test/connect/std_data/sexe.csv diff --git a/mysql-test/suite/connect/std_data/sitmat.csv b/storage/connect/mysql-test/connect/std_data/sitmat.csv similarity index 100% rename from mysql-test/suite/connect/std_data/sitmat.csv rename to storage/connect/mysql-test/connect/std_data/sitmat.csv diff --git a/mysql-test/suite/connect/std_data/test.sqlite3 b/storage/connect/mysql-test/connect/std_data/test.sqlite3 similarity index 100% rename from mysql-test/suite/connect/std_data/test.sqlite3 rename to storage/connect/mysql-test/connect/std_data/test.sqlite3 diff --git a/mysql-test/suite/connect/std_data/xsample.xml b/storage/connect/mysql-test/connect/std_data/xsample.xml similarity index 100% rename from mysql-test/suite/connect/std_data/xsample.xml rename to storage/connect/mysql-test/connect/std_data/xsample.xml diff --git a/mysql-test/suite/connect/suite.opt b/storage/connect/mysql-test/connect/suite.opt similarity index 100% rename from mysql-test/suite/connect/suite.opt rename to storage/connect/mysql-test/connect/suite.opt diff --git a/mysql-test/suite/connect/suite.pm b/storage/connect/mysql-test/connect/suite.pm similarity index 100% rename from mysql-test/suite/connect/suite.pm rename to storage/connect/mysql-test/connect/suite.pm diff --git a/mysql-test/suite/connect/t/bin.test b/storage/connect/mysql-test/connect/t/bin.test similarity index 95% rename from mysql-test/suite/connect/t/bin.test rename to storage/connect/mysql-test/connect/t/bin.test index e9becec3092..0266fd3e357 100644 --- a/mysql-test/suite/connect/t/bin.test +++ b/storage/connect/mysql-test/connect/t/bin.test @@ -4,7 +4,7 @@ let $TABLE_OPTIONS=TABLE_TYPE=BIN; let $FILE_EXT=BIN; --source grant.inc ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/Testbal.dat $MYSQLD_DATADIR/test/Testbal.dat +--copy_file $MTR_SUITE_DIR/std_data/Testbal.dat $MYSQLD_DATADIR/test/Testbal.dat --echo # --echo # Testing errors diff --git a/mysql-test/suite/connect/t/csv.test b/storage/connect/mysql-test/connect/t/csv.test similarity index 98% rename from mysql-test/suite/connect/t/csv.test rename to storage/connect/mysql-test/connect/t/csv.test index 9c39ff0a239..6578ba83a9a 100644 --- a/mysql-test/suite/connect/t/csv.test +++ b/storage/connect/mysql-test/connect/t/csv.test @@ -4,7 +4,7 @@ let $TABLE_OPTIONS=TABLE_TYPE=CSV; let $FILE_EXT=CSV; --source grant.inc ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/people.csv $MYSQLD_DATADIR/test/people.csv +--copy_file $MTR_SUITE_DIR/std_data/people.csv $MYSQLD_DATADIR/test/people.csv SET NAMES utf8; diff --git a/mysql-test/suite/connect/t/dbf.test b/storage/connect/mysql-test/connect/t/dbf.test similarity index 100% rename from mysql-test/suite/connect/t/dbf.test rename to storage/connect/mysql-test/connect/t/dbf.test diff --git a/mysql-test/suite/connect/t/dir.test b/storage/connect/mysql-test/connect/t/dir.test similarity index 94% rename from mysql-test/suite/connect/t/dir.test rename to storage/connect/mysql-test/connect/t/dir.test index e32b89de9be..1d4ec2cedbf 100644 --- a/mysql-test/suite/connect/t/dir.test +++ b/storage/connect/mysql-test/connect/t/dir.test @@ -82,8 +82,8 @@ CREATE TABLE t1 ( --replace_result $MYSQLD_DATADIR DATADIR/ SELECT * FROM t1; ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/boys.txt $MYSQLD_DATADIR/test/boys.txt ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/boyswin.txt $MYSQLD_DATADIR/test/boyswin.txt +--copy_file $MTR_SUITE_DIR/std_data/boys.txt $MYSQLD_DATADIR/test/boys.txt +--copy_file $MTR_SUITE_DIR/std_data/boyswin.txt $MYSQLD_DATADIR/test/boyswin.txt --mkdir $MYSQLD_DATADIR/test/subdir/ --copy_file $MYSQLD_DATADIR/test/boys.txt $MYSQLD_DATADIR/test/subdir/boys2.txt diff --git a/mysql-test/suite/connect/t/fix.test b/storage/connect/mysql-test/connect/t/fix.test similarity index 90% rename from mysql-test/suite/connect/t/fix.test rename to storage/connect/mysql-test/connect/t/fix.test index bc681d8a1f6..d2dfeb21352 100644 --- a/mysql-test/suite/connect/t/fix.test +++ b/storage/connect/mysql-test/connect/t/fix.test @@ -4,9 +4,9 @@ let $TABLE_OPTIONS=TABLE_TYPE=FIX; let $FILE_EXT=FIX; --source grant.inc ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/dept.dat $MYSQLD_DATADIR/test/dept.dat ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/boys.txt $MYSQLD_DATADIR/test/boys.txt ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/boyswin.txt $MYSQLD_DATADIR/test/boyswin.txt +--copy_file $MTR_SUITE_DIR/std_data/dept.dat $MYSQLD_DATADIR/test/dept.dat +--copy_file $MTR_SUITE_DIR/std_data/boys.txt $MYSQLD_DATADIR/test/boys.txt +--copy_file $MTR_SUITE_DIR/std_data/boyswin.txt $MYSQLD_DATADIR/test/boyswin.txt --echo # --echo # Testing errors diff --git a/mysql-test/suite/connect/t/fmt.test b/storage/connect/mysql-test/connect/t/fmt.test similarity index 92% rename from mysql-test/suite/connect/t/fmt.test rename to storage/connect/mysql-test/connect/t/fmt.test index 9131349b4ba..de7f8c06c1b 100644 --- a/mysql-test/suite/connect/t/fmt.test +++ b/storage/connect/mysql-test/connect/t/fmt.test @@ -1,6 +1,6 @@ let $MYSQLD_DATADIR= `select @@datadir`; ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/funny.txt $MYSQLD_DATADIR/test/funny.txt ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/funny2.txt $MYSQLD_DATADIR/test/funny2.txt +--copy_file $MTR_SUITE_DIR/std_data/funny.txt $MYSQLD_DATADIR/test/funny.txt +--copy_file $MTR_SUITE_DIR/std_data/funny2.txt $MYSQLD_DATADIR/test/funny2.txt --echo # --echo # Testing errors diff --git a/mysql-test/suite/connect/t/general.test b/storage/connect/mysql-test/connect/t/general.test similarity index 100% rename from mysql-test/suite/connect/t/general.test rename to storage/connect/mysql-test/connect/t/general.test diff --git a/mysql-test/suite/connect/t/grant.inc b/storage/connect/mysql-test/connect/t/grant.inc similarity index 100% rename from mysql-test/suite/connect/t/grant.inc rename to storage/connect/mysql-test/connect/t/grant.inc diff --git a/mysql-test/suite/connect/t/index.test b/storage/connect/mysql-test/connect/t/index.test similarity index 88% rename from mysql-test/suite/connect/t/index.test rename to storage/connect/mysql-test/connect/t/index.test index 14d4f62c11e..5e913582734 100644 --- a/mysql-test/suite/connect/t/index.test +++ b/storage/connect/mysql-test/connect/t/index.test @@ -1,7 +1,7 @@ let $MYSQLD_DATADIR= `select @@datadir`; ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/emp.txt $MYSQLD_DATADIR/test/emp.txt ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/sexe.csv $MYSQLD_DATADIR/test/sexe.csv ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/sitmat.csv $MYSQLD_DATADIR/test/sitmat.csv +--copy_file $MTR_SUITE_DIR/std_data/emp.txt $MYSQLD_DATADIR/test/emp.txt +--copy_file $MTR_SUITE_DIR/std_data/sexe.csv $MYSQLD_DATADIR/test/sexe.csv +--copy_file $MTR_SUITE_DIR/std_data/sitmat.csv $MYSQLD_DATADIR/test/sitmat.csv --echo # --echo # Testing indexing diff --git a/mysql-test/suite/connect/t/ini.test b/storage/connect/mysql-test/connect/t/ini.test similarity index 98% rename from mysql-test/suite/connect/t/ini.test rename to storage/connect/mysql-test/connect/t/ini.test index 0fd27178713..e862f3cd672 100644 --- a/mysql-test/suite/connect/t/ini.test +++ b/storage/connect/mysql-test/connect/t/ini.test @@ -75,7 +75,7 @@ DROP USER user@localhost; --echo # ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/contact.ini $MYSQLD_DATADIR/test/contact.ini +--copy_file $MTR_SUITE_DIR/std_data/contact.ini $MYSQLD_DATADIR/test/contact.ini --echo # --echo # Testing errors diff --git a/mysql-test/suite/connect/t/mysql.test b/storage/connect/mysql-test/connect/t/mysql.test similarity index 100% rename from mysql-test/suite/connect/t/mysql.test rename to storage/connect/mysql-test/connect/t/mysql.test diff --git a/mysql-test/suite/connect/t/null.test b/storage/connect/mysql-test/connect/t/null.test similarity index 100% rename from mysql-test/suite/connect/t/null.test rename to storage/connect/mysql-test/connect/t/null.test diff --git a/mysql-test/suite/connect/t/odbc_sqlite3.test b/storage/connect/mysql-test/connect/t/odbc_sqlite3.test similarity index 97% rename from mysql-test/suite/connect/t/odbc_sqlite3.test rename to storage/connect/mysql-test/connect/t/odbc_sqlite3.test index 22bddac60a5..91b9c230c69 100644 --- a/mysql-test/suite/connect/t/odbc_sqlite3.test +++ b/storage/connect/mysql-test/connect/t/odbc_sqlite3.test @@ -60,7 +60,7 @@ SELECT user(); # the data file, we'll use directly the file in std_data. # As we do not do any modifications in the database, this should be OK. # -let $Database=$MYSQL_TEST_DIR/suite/connect/std_data/test.sqlite3; +let $Database=$MTR_SUITE_DIR/std_data/test.sqlite3; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --eval CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='Driver=SQLite3 ODBC Driver;Database=$Database;NoWCHAR=yes' CHARSET=utf8 DATA_CHARSET=utf8; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR diff --git a/mysql-test/suite/connect/t/odbc_xls.test b/storage/connect/mysql-test/connect/t/odbc_xls.test similarity index 88% rename from mysql-test/suite/connect/t/odbc_xls.test rename to storage/connect/mysql-test/connect/t/odbc_xls.test index 0c79196c8eb..449d8983d63 100644 --- a/mysql-test/suite/connect/t/odbc_xls.test +++ b/storage/connect/mysql-test/connect/t/odbc_xls.test @@ -16,7 +16,7 @@ DROP TABLE t1; let $MYSQLD_DATADIR= `select @@datadir`; ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/contacts.xls $MYSQLD_DATADIR/test/contacts.xls +--copy_file $MTR_SUITE_DIR/std_data/contacts.xls $MYSQLD_DATADIR/test/contacts.xls --replace_result $MYSQLD_DATADIR DATADIR --eval CREATE TABLE contact (Nom VARCHAR(128), Fonction VARCHAR(128), Company VARCHAR(128), Repertoire VARCHAR(30)) ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineXLS;DBQ=$MYSQLD_DATADIR/test/contacts.xls'; diff --git a/mysql-test/suite/connect/t/secure_file_priv-master.opt b/storage/connect/mysql-test/connect/t/secure_file_priv-master.opt similarity index 100% rename from mysql-test/suite/connect/t/secure_file_priv-master.opt rename to storage/connect/mysql-test/connect/t/secure_file_priv-master.opt diff --git a/mysql-test/suite/connect/t/secure_file_priv.test b/storage/connect/mysql-test/connect/t/secure_file_priv.test similarity index 100% rename from mysql-test/suite/connect/t/secure_file_priv.test rename to storage/connect/mysql-test/connect/t/secure_file_priv.test diff --git a/mysql-test/suite/connect/t/tbl.test b/storage/connect/mysql-test/connect/t/tbl.test similarity index 100% rename from mysql-test/suite/connect/t/tbl.test rename to storage/connect/mysql-test/connect/t/tbl.test diff --git a/mysql-test/suite/connect/t/upd.test b/storage/connect/mysql-test/connect/t/upd.test similarity index 94% rename from mysql-test/suite/connect/t/upd.test rename to storage/connect/mysql-test/connect/t/upd.test index d51fa09b846..f6461bfed96 100644 --- a/mysql-test/suite/connect/t/upd.test +++ b/storage/connect/mysql-test/connect/t/upd.test @@ -1,5 +1,5 @@ let $MYSQLD_DATADIR= `select @@datadir`; ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/employee.dat $MYSQLD_DATADIR/test/employee.dat +--copy_file $MTR_SUITE_DIR/std_data/employee.dat $MYSQLD_DATADIR/test/employee.dat CREATE TABLE employee ( diff --git a/mysql-test/suite/connect/t/vec.test b/storage/connect/mysql-test/connect/t/vec.test similarity index 100% rename from mysql-test/suite/connect/t/vec.test rename to storage/connect/mysql-test/connect/t/vec.test diff --git a/mysql-test/suite/connect/t/xml.test b/storage/connect/mysql-test/connect/t/xml.test similarity index 95% rename from mysql-test/suite/connect/t/xml.test rename to storage/connect/mysql-test/connect/t/xml.test index 4ce4d59ff75..96e7e1a3a97 100644 --- a/mysql-test/suite/connect/t/xml.test +++ b/storage/connect/mysql-test/connect/t/xml.test @@ -25,9 +25,9 @@ SET NAMES utf8; --vertical_results ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/xsample.xml $MYSQLD_DATADIR/test/xsample.xml ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/latin1.xml $MYSQLD_DATADIR/test/latin1.xml ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/cp1251.xml $MYSQLD_DATADIR/test/cp1251.xml +--copy_file $MTR_SUITE_DIR/std_data/xsample.xml $MYSQLD_DATADIR/test/xsample.xml +--copy_file $MTR_SUITE_DIR/std_data/latin1.xml $MYSQLD_DATADIR/test/latin1.xml +--copy_file $MTR_SUITE_DIR/std_data/cp1251.xml $MYSQLD_DATADIR/test/cp1251.xml #--echo $MYSQL_TEST_DIR #--exec pwd @@ -114,7 +114,8 @@ DROP TABLE t1; --echo # --echo # Testing INSERT on mixed tag and attribute values --echo # ---copy_file $MYSQL_TEST_DIR/suite/connect/std_data/xsample.xml $MYSQLD_DATADIR/test/xsample2.xml +--copy_file $MTR_SUITE_DIR/std_data/xsample.xml $MYSQLD_DATADIR/test/xsample2.xml +--chmod 0644 $MYSQLD_DATADIR/test/xsample2.xml CREATE TABLE t1 ( ISBN CHAR(15) FIELD_FORMAT='@', LANG CHAR(2) FIELD_FORMAT='@',