small mtr cleanup

and move the connect suite into storage/connect/

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=

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");

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

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;
 

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

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

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

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

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

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

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';

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
 (

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='@',