diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2020-07-30 13:31:14 +0900 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-03 10:28:36 +0200 |
| commit | fcf136c40862253ac3045e6804a32b0d020169a4 (patch) | |
| tree | 85ace08f3759151ef7bed1b1c1732eb7ac0ac3ce | |
| parent | b84ab760e8db284785f829a4289fb6c7424b4c2d (diff) | |
| download | mariadb-git-fcf136c40862253ac3045e6804a32b0d020169a4.tar.gz | |
MENT-812 in bb-10.5-MENT-30, Spider uses unusual names for ODBC Connection Keywords/Parameters
Support filedsn and driver
37 files changed, 900 insertions, 995 deletions
diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/filedsn_deinit.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/filedsn_deinit.inc new file mode 100644 index 00000000000..414300c8657 --- /dev/null +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/filedsn_deinit.inc @@ -0,0 +1,7 @@ +--let $MASTER_1_COMMENT_2_1= $MASTER_1_COMMENT_2_1_BACKUP +--remove_file $MYSQLTEST_VARDIR/tmp/spider_filedsn.dsn +--disable_query_log +--disable_result_log +--source ../t/test_deinit.inc +--enable_result_log +--enable_query_log diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/filedsn_init.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/filedsn_init.inc new file mode 100644 index 00000000000..eb44055ec35 --- /dev/null +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/filedsn_init.inc @@ -0,0 +1,19 @@ +--disable_query_log +--disable_result_log +--source ../t/test_init.inc +eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/spider_filedsn.dsn' FROM ( + SELECT '[ODBC]' UNION ALL + SELECT 'Driver=MariaDB ODBC 3.0 Driver' UNION ALL + SELECT 'Servername=127.0.0.1' UNION ALL + SELECT 'Database=auto_test_remote' UNION ALL + SELECT 'UserName=root' UNION ALL + SELECT 'Password=' UNION ALL + SELECT 'Port=$CHILD2_1_MYPORT' +) a; +--enable_result_log +--enable_query_log +--let $MASTER_1_COMMENT_2_1_BACKUP= $MASTER_1_COMMENT_2_1 +let $MASTER_1_COMMENT_2_1= + COMMENT='filedsn "$MYSQLTEST_VARDIR/tmp/spider_filedsn.dsn", table "ta_r", wrapper "odbc_mariadb"'; +let $SPIDER_DIRECT_SQL_1= + SELECT spider_direct_sql('SELECT 1', '', 'filedsn "$MYSQLTEST_VARDIR/tmp/spider_filedsn.dsn", wrapper "odbc_mariadb"'); diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_1.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_1.inc index 75655afcb1d..2d172086864 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_1.inc +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_1.inc @@ -19,15 +19,15 @@ let $CHILD3_1_CHECK_LINK_FAILED_LOG= let $CHILD3_1_SET_RECOVERY_STATUS_2_1= ALTER TABLE ta_l CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 2"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 2"'; let $CHILD3_1_SET_OK_STATUS_2_1= ALTER TABLE ta_l CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 1"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 1"'; let $CHILD3_1_SET_OK_STATUS_AS_2_1= ALTER TABLE ta_l CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "1 0"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "1 0"'; let $CHILD3_1_DROP_TABLES_HA_2_1= DROP TABLE IF EXISTS ta_l; @@ -42,7 +42,7 @@ if ($VERSION_COMPILE_OS_WIN) ) $CHILD3_1_ENGINE $CHILD3_1_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $CHILD3_1_CREATE_TABLES_HA_AS_2_1= CREATE TABLE ta_l ( a INT DEFAULT 10, @@ -52,7 +52,7 @@ if ($VERSION_COMPILE_OS_WIN) ) $CHILD3_1_ENGINE $CHILD3_1_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; } if (!$VERSION_COMPILE_OS_WIN) { @@ -65,7 +65,7 @@ if (!$VERSION_COMPILE_OS_WIN) ) $CHILD3_1_ENGINE $CHILD3_1_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $CHILD3_1_CREATE_TABLES_HA_AS_2_1= CREATE TABLE ta_l ( a INT DEFAULT 10, @@ -75,7 +75,7 @@ if (!$VERSION_COMPILE_OS_WIN) ) $CHILD3_1_ENGINE $CHILD3_1_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; } let $CHILD3_1_DROP_TABLES_HA_P_2_1= DROP TABLE IF EXISTS ta_l2; @@ -88,9 +88,9 @@ let $CHILD3_1_CREATE_TABLES_HA_P_2_1= ) $CHILD3_1_ENGINE $CHILD3_1_CHARSET COMMENT='msi "$CHILD3_1_SERVER_ID", mkd "2"' PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001"' ); let $CHILD3_1_CREATE_TABLES_HA_AS_P_2_1= @@ -102,32 +102,32 @@ let $CHILD3_1_CREATE_TABLES_HA_AS_P_2_1= ) $CHILD3_1_ENGINE $CHILD3_1_CHARSET COMMENT='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1"' PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001"' ); let $CHILD3_1_SET_RECOVERY_STATUS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "0 2"' ); let $CHILD3_1_SET_OK_STATUS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "0 1"' ); let $CHILD3_1_SET_OK_STATUS_AS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "1 0"' ); diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_2.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_2.inc index 306c966378d..b8250f0fea8 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_2.inc +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_2.inc @@ -19,15 +19,15 @@ let $CHILD3_2_CHECK_LINK_FAILED_LOG= let $CHILD3_2_SET_RECOVERY_STATUS_2_1= ALTER TABLE ta_l CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 2"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 2"'; let $CHILD3_2_SET_OK_STATUS_2_1= ALTER TABLE ta_l CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 1"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 1"'; let $CHILD3_2_SET_OK_STATUS_AS_2_1= ALTER TABLE ta_l CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "1 0"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "1 0"'; let $CHILD3_2_DROP_TABLES_HA_2_1= DROP TABLE IF EXISTS ta_l; @@ -42,7 +42,7 @@ if ($VERSION_COMPILE_OS_WIN) ) $CHILD3_2_ENGINE $CHILD3_2_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $CHILD3_2_CREATE_TABLES_HA_AS_2_1= CREATE TABLE ta_l ( a INT DEFAULT 10, @@ -52,7 +52,7 @@ if ($VERSION_COMPILE_OS_WIN) ) $CHILD3_2_ENGINE $CHILD3_2_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; } if (!$VERSION_COMPILE_OS_WIN) { @@ -65,7 +65,7 @@ if (!$VERSION_COMPILE_OS_WIN) ) $CHILD3_2_ENGINE $CHILD3_2_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $CHILD3_2_CREATE_TABLES_HA_AS_2_1= CREATE TABLE ta_l ( a INT DEFAULT 10, @@ -75,7 +75,7 @@ if (!$VERSION_COMPILE_OS_WIN) ) $CHILD3_2_ENGINE $CHILD3_2_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; } let $CHILD3_2_DROP_TABLES_HA_P_2_1= DROP TABLE IF EXISTS ta_l2; @@ -88,9 +88,9 @@ let $CHILD3_2_CREATE_TABLES_HA_P_2_1= ) $CHILD3_2_ENGINE $CHILD3_2_CHARSET COMMENT='msi "$CHILD3_1_SERVER_ID", mkd "2"' PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001"' ); let $CHILD3_2_CREATE_TABLES_HA_AS_P_2_1= @@ -102,32 +102,32 @@ let $CHILD3_2_CREATE_TABLES_HA_AS_P_2_1= ) $CHILD3_2_ENGINE $CHILD3_2_CHARSET COMMENT='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1"' PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001"' ); let $CHILD3_2_SET_RECOVERY_STATUS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "0 2"' ); let $CHILD3_2_SET_OK_STATUS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "0 1"' ); let $CHILD3_2_SET_OK_STATUS_AS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "1 0"' ); diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_3.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_3.inc index 838c9c1cd64..e92c3ad3b5b 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_3.inc +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_child3_3.inc @@ -19,15 +19,15 @@ let $CHILD3_3_CHECK_LINK_FAILED_LOG= let $CHILD3_3_SET_RECOVERY_STATUS_2_1= ALTER TABLE ta_l CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 2"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 2"'; let $CHILD3_3_SET_OK_STATUS_2_1= ALTER TABLE ta_l CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 1"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "0 1"'; let $CHILD3_3_SET_OK_STATUS_AS_2_1= ALTER TABLE ta_l CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "1 0"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", lst "1 0"'; let $CHILD3_3_DROP_TABLES_HA_2_1= DROP TABLE IF EXISTS ta_l; @@ -42,7 +42,7 @@ if ($VERSION_COMPILE_OS_WIN) ) $CHILD3_3_ENGINE $CHILD3_3_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $CHILD3_3_CREATE_TABLES_HA_AS_2_1= CREATE TABLE ta_l ( a INT DEFAULT 10, @@ -52,7 +52,7 @@ if ($VERSION_COMPILE_OS_WIN) ) $CHILD3_3_ENGINE $CHILD3_3_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; } if (!$VERSION_COMPILE_OS_WIN) { @@ -65,7 +65,7 @@ if (!$VERSION_COMPILE_OS_WIN) ) $CHILD3_3_ENGINE $CHILD3_3_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $CHILD3_3_CREATE_TABLES_HA_AS_2_1= CREATE TABLE ta_l ( a INT DEFAULT 10, @@ -75,7 +75,7 @@ if (!$VERSION_COMPILE_OS_WIN) ) $CHILD3_3_ENGINE $CHILD3_3_CHARSET COMMENT='table "ta_r ta_r3"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1", - database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; } let $CHILD3_3_DROP_TABLES_HA_P_2_1= DROP TABLE IF EXISTS ta_l2; @@ -88,9 +88,9 @@ let $CHILD3_3_CREATE_TABLES_HA_P_2_1= ) $CHILD3_3_ENGINE $CHILD3_3_CHARSET COMMENT='msi "$CHILD3_1_SERVER_ID", mkd "2"' PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001"' ); let $CHILD3_3_CREATE_TABLES_HA_AS_P_2_1= @@ -102,32 +102,32 @@ let $CHILD3_3_CREATE_TABLES_HA_AS_P_2_1= ) $CHILD3_3_ENGINE $CHILD3_3_CHARSET COMMENT='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1"' PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001"' ); let $CHILD3_3_SET_RECOVERY_STATUS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "0 2"' ); let $CHILD3_3_SET_OK_STATUS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "0 1"' ); let $CHILD3_3_SET_OK_STATUS_AS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "1 0"' ); diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_master_1.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_master_1.inc index 32b502e428e..d2944f07dfb 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_master_1.inc +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/ha_init_master_1.inc @@ -26,51 +26,51 @@ let $MASTER_1_COPY_TABLES_2_1= SELECT spider_copy_tables('ta_l', '0', '1'); let $MASTER_1_COMMENT_HA_2_1= - COMMENT='database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r ta_r3", + COMMENT='database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r ta_r3", wrapper "odbc_mariadb"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2"'; let $MASTER_1_COMMENT_HA_AS_2_1= - COMMENT='database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r ta_r3", + COMMENT='database "auto_test_remote auto_test_remote2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r ta_r3", wrapper "odbc_mariadb"' CONNECTION='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1"'; let $MASTER_1_COMMENT_HA_P_2_1= COMMENT='msi "$CHILD3_1_SERVER_ID", mkd "2"' PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001"' ); let $MASTER_1_COMMENT_HA_AS_P_2_1= COMMENT='msi "$CHILD3_1_SERVER_ID", mkd "2", alc "1"' PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001"' ); let $MASTER_1_SET_RECOVERY_STATUS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "0 2"' ); let $MASTER_1_SET_OK_STATUS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "0 1"' ); let $MASTER_1_SET_OK_STATUS_AS_P_2_1= ALTER TABLE ta_l2 PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", + PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r ta_r3", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", + PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "1 0"' ); let $MASTER_1_COPY_TABLES_P_2_1= diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_1.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_1.inc index b2c1faf20e5..3c60da6979c 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_1.inc +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_1.inc @@ -1,87 +1,87 @@ let $CHILD2_1_DATEFORMAT= SELECT 1; let $CHILD2_1_DROP_DATABASE= - SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_DATABASE_IFEXISTS= - SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_DATABASE= - SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON + SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT1= - SELECT spider_direct_sql('SELECT 1', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT 1', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_TABLES= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_TABLES= SELECT spider_direct_sql('CREATE TABLE `ta_r` ( `a` INT DEFAULT 10, `b` CHAR(1) DEFAULT \'c\', `c` DATE DEFAULT \'1999-10-10\', PRIMARY KEY(`a`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('CREATE INDEX `idx1` ON `ta_r`(`b`)', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('CREATE INDEX `idx1` ON `ta_r`(`b`)', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_TABLES= - SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r` ORDER BY `a`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r` ORDER BY `a`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_TABLES2= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r2`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r2`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_TABLES2= SELECT spider_direct_sql('CREATE TABLE `ta_r2` ( `a` INT DEFAULT 10, `b` CHAR(1) DEFAULT \'c\', `c` DATE DEFAULT \'1999-10-10\', PRIMARY KEY(`a`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_TABLES2= - SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r2` ORDER BY `a`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r2` ORDER BY `a`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_TABLES3= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r_no_idx`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r_no_idx`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_TABLES3= SELECT spider_direct_sql('CREATE TABLE `ta_r_no_idx` ( `a` INT DEFAULT 10, `b` CHAR(1) DEFAULT \'c\', `c` DATE DEFAULT \'1999-10-10\' - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_TABLES3= - SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r_no_idx` ORDER BY `a`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r_no_idx` ORDER BY `a`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_TABLES4= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r_auto_inc`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r_auto_inc`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_TABLES4= SELECT spider_direct_sql('CREATE TABLE `ta_r_auto_inc` ( `a` INT AUTO_INCREMENT, `b` CHAR(1) DEFAULT \'c\', `c` DATE DEFAULT \'1999-10-10\', PRIMARY KEY(`a`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_TABLES4= SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r_auto_inc` - ORDER BY `a`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + ORDER BY `a`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_TABLES5= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `s_2_1_ta_r_int`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `s_2_1_ta_r_int`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_TABLES5= SELECT spider_direct_sql('CREATE TABLE `s_2_1_ta_r_int` ( `a` INT AUTO_INCREMENT, `b` INT DEFAULT 10, `c` INT DEFAULT 11, PRIMARY KEY(`a`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('CREATE INDEX `idx1_s_2_1_ta_r_int` ON `s_2_1_ta_r_int`(`b`)', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('CREATE INDEX `idx1_s_2_1_ta_r_int` ON `s_2_1_ta_r_int`(`b`)', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('CREATE INDEX `idx2_s_2_1_ta_r_int` ON `s_2_1_ta_r_int`(`c`)', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('CREATE INDEX `idx2_s_2_1_ta_r_int` ON `s_2_1_ta_r_int`(`c`)', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_TABLES5= - SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `s_2_1_ta_r_int` ORDER BY `a`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `s_2_1_ta_r_int` ORDER BY `a`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_TABLES6= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r_3`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r_3`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_TABLES6= SELECT spider_direct_sql('CREATE TABLE `ta_r_3` ( `a` INT DEFAULT 10, `b` CHAR(1) DEFAULT \'c\', `c` DATE DEFAULT \'1999-10-10\' - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_TABLES6= - SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r_3` ORDER BY `a`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r_3` ORDER BY `a`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_FT_TABLES= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `ft_r`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `ft_r`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_FT_TABLES= SELECT spider_direct_sql('CREATE TABLE `ft_r` ( `a` INT DEFAULT 0, @@ -91,11 +91,11 @@ let $CHILD2_1_CREATE_FT_TABLES= PRIMARY KEY(`a`), FULLTEXT INDEX "ft_idx1"(`b`), FULLTEXT INDEX "ft_idx2"(`c`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_FT_TABLES= - SELECT spider_direct_sql('SELECT `a`, `b`, `c`, `d` FROM `ft_r` ORDER BY `a`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c`, `d` FROM `ft_r` ORDER BY `a`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_FT_TABLES2= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `ft_r2`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `ft_r2`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_FT_TABLES2= SELECT spider_direct_sql('CREATE TABLE `ft_r2` ( `a` INT DEFAULT 0, @@ -105,11 +105,11 @@ let $CHILD2_1_CREATE_FT_TABLES2= PRIMARY KEY(`a`), FULLTEXT INDEX "ft_idx1"(`b`), FULLTEXT INDEX "ft_idx2"(`c`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_FT_TABLES2= - SELECT spider_direct_sql('SELECT `a`, `b`, `c`, `d` FROM `ft_r2` ORDER BY `a`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c`, `d` FROM `ft_r2` ORDER BY `a`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_GM_TABLES= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `gm_r`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `gm_r`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_GM_TABLES= SELECT spider_direct_sql('CREATE TABLE `gm_r` ( `a` INT DEFAULT 0, @@ -118,11 +118,11 @@ let $CHILD2_1_CREATE_GM_TABLES= PRIMARY KEY(`a`), SPATIAL INDEX "sp_idx1"(`b`), SPATIAL INDEX "sp_idx2"(`c`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_GM_TABLES= - SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `gm_r` ORDER BY `a`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `gm_r` ORDER BY `a`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_GM_TABLES2= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `gm_r2`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `gm_r2`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_GM_TABLES2= SELECT spider_direct_sql('CREATE TABLE `gm_r2` ( `a` INT DEFAULT 0, @@ -131,61 +131,61 @@ let $CHILD2_1_CREATE_GM_TABLES2= PRIMARY KEY(`a`), SPATIAL INDEX "sp_idx1"(`b`), SPATIAL INDEX "sp_idx2"(`c`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_GM_TABLES2= - SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `gm_r2` ORDER BY `a`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `gm_r2` ORDER BY `a`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_LOCK_TABLES1= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1_1`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1_1`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_LOCK_TABLES1= SELECT spider_direct_sql('CREATE TABLE `t1_1` ( `id` INT NOT NULL, PRIMARY KEY (`id`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_LOCK_TABLES2= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `t2_2`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `t2_2`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_LOCK_TABLES2= SELECT spider_direct_sql('CREATE TABLE `t2_2` ( `id` INT NOT NULL, PRIMARY KEY (`id`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_INCREMENT_TABLES1= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1_1`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1_1`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_INCREMENT_TABLES1= SELECT spider_direct_sql('CREATE TABLE `t1_1` ( `id` INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (`id`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_INCREMENT_TABLES1= - SELECT spider_direct_sql('SELECT `id` FROM `t1_1` ORDER BY `id`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `id` FROM `t1_1` ORDER BY `id`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_TEXT_PK_TABLES1= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_TEXT_PK_TABLES1= SELECT spider_direct_sql('CREATE TABLE `t1` ( `a` VARCHAR(255), PRIMARY KEY (`a`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_TEXT_PK_TABLES1= - SELECT spider_direct_sql('SELECT `a` FROM `t1` ORDER BY `a`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a` FROM `t1` ORDER BY `a`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_DROP_TEXT_KEY_TABLES1= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_CREATE_TEXT_KEY_TABLES1= SELECT spider_direct_sql('CREATE TABLE `t1` ( `a` VARCHAR(255), `b` VARCHAR(255), `c` VARCHAR(255), PRIMARY KEY (`c`) - )', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + )', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('CREATE INDEX `idx1_t1` ON `t1`(`a`,`b`)', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('CREATE INDEX `idx1_t1` ON `t1`(`a`,`b`)', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('CREATE INDEX `idx2_t1` ON `t1`(`b`)', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('CREATE INDEX `idx2_t1` ON `t1`(`b`)', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_SELECT_TEXT_KEY_TABLES1= - SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `t1` ORDER BY `c`', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `t1` ORDER BY `c`', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_AUTO_INCREMENT_INCREMENT1= - SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_AUTO_INCREMENT_INCREMENT2= - SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_AUTO_INCREMENT_OFFSET1= - SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_1_AUTO_INCREMENT_OFFSET2= - SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_2.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_2.inc index fe5f9bcccaf..a189179e04b 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_2.inc +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_2.inc @@ -1,40 +1,40 @@ let $CHILD2_2_DATEFORMAT= SELECT 1; let $CHILD2_2_DROP_DATABASE= - SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_DROP_DATABASE_IFEXISTS= - SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_CREATE_DATABASE= - SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON + SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_SELECT1= - SELECT spider_direct_sql('SELECT 1', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT 1', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_DROP_TABLES= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r3`', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r3`', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_CREATE_TABLES= SELECT spider_direct_sql('CREATE TABLE `ta_r3` ( `a` INT DEFAULT 10, `b` CHAR(1) DEFAULT \'c\', `c` DATE DEFAULT \'1999-10-10\', PRIMARY KEY(`a`) - )', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_DROP_TABLES5= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `s_2_2_ta_r_int`', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `s_2_2_ta_r_int`', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_CREATE_TABLES5= SELECT spider_direct_sql('CREATE TABLE `s_2_2_ta_r_int` ( `a` INT AUTO_INCREMENT, `b` INT DEFAULT 10, `c` INT DEFAULT 11, PRIMARY KEY(`a`) - )', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') + )', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('CREATE INDEX `idx1_s_2_2_ta_r_int` ON `s_2_2_ta_r_int`(`b`)', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('CREATE INDEX `idx1_s_2_2_ta_r_int` ON `s_2_2_ta_r_int`(`b`)', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('CREATE INDEX `idx2_s_2_2_ta_r_int` ON `s_2_2_ta_r_int`(`c`)', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('CREATE INDEX `idx2_s_2_2_ta_r_int` ON `s_2_2_ta_r_int`(`c`)', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_SELECT_TABLES= - SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r3` ORDER BY `a`', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r3` ORDER BY `a`', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_DROP_FT_TABLES= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `ft_r3`', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `ft_r3`', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_CREATE_FT_TABLES= SELECT spider_direct_sql('CREATE TABLE `ft_r3` ( `a` INT DEFAULT 0, @@ -44,11 +44,11 @@ let $CHILD2_2_CREATE_FT_TABLES= PRIMARY KEY(`a`), FULLTEXT INDEX "ft_idx1"(`b`), FULLTEXT INDEX "ft_idx2"(`c`) - )', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_SELECT_FT_TABLES= - SELECT spider_direct_sql('SELECT `a`, `b`, `c`, `d` FROM `ft_r3` ORDER BY `a`', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c`, `d` FROM `ft_r3` ORDER BY `a`', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_DROP_GM_TABLES= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `gm_r3`', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `gm_r3`', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_CREATE_GM_TABLES= SELECT spider_direct_sql('CREATE TABLE `gm_r3` ( `a` INT DEFAULT 0, @@ -57,37 +57,37 @@ let $CHILD2_2_CREATE_GM_TABLES= PRIMARY KEY(`a`), SPATIAL INDEX "sp_idx1"(`b`), SPATIAL INDEX "sp_idx2"(`c`) - )', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_SELECT_GM_TABLES= - SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `gm_r3` ORDER BY `a`', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `gm_r3` ORDER BY `a`', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_DROP_LOCK_TABLES1= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1_2`', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1_2`', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_CREATE_LOCK_TABLES1= SELECT spider_direct_sql('CREATE TABLE `t1_2` ( `id` INT NOT NULL, PRIMARY KEY (`id`) - )', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_DROP_LOCK_TABLES2= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `t2_1`', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `t2_1`', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_CREATE_LOCK_TABLES2= SELECT spider_direct_sql('CREATE TABLE `t2_1` ( `id` INT NOT NULL, PRIMARY KEY (`id`) - )', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_DROP_INCREMENT_TABLES1= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1_2`', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `t1_2`', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_CREATE_INCREMENT_TABLES1= SELECT spider_direct_sql('CREATE TABLE `t1_2` ( `id` INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (`id`) - )', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_SELECT_INCREMENT_TABLES1= - SELECT spider_direct_sql('SELECT `id` FROM `t1_2` ORDER BY `id`', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `id` FROM `t1_2` ORDER BY `id`', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_AUTO_INCREMENT_INCREMENT1= - SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_AUTO_INCREMENT_INCREMENT2= - SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_AUTO_INCREMENT_OFFSET1= - SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_2_AUTO_INCREMENT_OFFSET2= - SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET GLOBAL AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_3.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_3.inc index 40d1d42303b..b28a84937a0 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_3.inc +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/init_child2_3.inc @@ -1,22 +1,22 @@ let $CHILD2_3_DATEFORMAT= SELECT 1; let $CHILD2_3_DROP_DATABASE= - SELECT spider_direct_sql('DROP DATABASE auto_test_remote3', '', 'srv "s_2_3", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP DATABASE auto_test_remote3', '', 'srv "s_2_3", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_3_DROP_DATABASE_IFEXISTS= - SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_3_CREATE_DATABASE= - SELECT spider_direct_sql('CREATE DATABASE auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('USE auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('CREATE DATABASE auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON + SELECT spider_direct_sql('USE auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_3_SELECT1= - SELECT spider_direct_sql('SELECT 1', '', 'srv "s_2_3", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT 1', '', 'srv "s_2_3", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_3_DROP_TABLES= - SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r4`', '', 'srv "s_2_3", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('DROP TABLE IF EXISTS `ta_r4`', '', 'srv "s_2_3", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_3_CREATE_TABLES= SELECT spider_direct_sql('CREATE TABLE `ta_r4` ( `a` INT DEFAULT 10, `b` CHAR(1) DEFAULT \'c\', `c` DATE DEFAULT \'1999-10-10\', PRIMARY KEY(`a`) - )', '', 'srv "s_2_3", default_group "MariaDB ODBC 3.0 Driver"'); + )', '', 'srv "s_2_3", driver "MariaDB ODBC 3.0 Driver"'); let $CHILD2_3_SELECT_TABLES= - SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r4` ORDER BY `a`', '', 'srv "s_2_3", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SELECT `a`, `b`, `c` FROM `ta_r4` ORDER BY `a`', '', 'srv "s_2_3", driver "MariaDB ODBC 3.0 Driver"'); diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/init_master_1.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/init_master_1.inc index c1bd40d0390..4818923a861 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/include/init_master_1.inc +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/init_master_1.inc @@ -3,84 +3,84 @@ SET spider_direct_order_limit= 10000; SET spider_init_sql_alloc_size= 1; SET spider_conn_recycle_mode= 0; let $MASTER_1_COMMENT_2_1= - COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r", wrapper "odbc_mariadb"'; + COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r", wrapper "odbc_mariadb"'; let $MASTER_1_COMMENT2_2_1= - COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r_no_idx", wrapper "odbc_mariadb"' + COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r_no_idx", wrapper "odbc_mariadb"' CONNECTION='prt "2000000"'; let $MASTER_1_COMMENT_P_2_1= COMMENT='table "ta_r3"' PARTITION BY KEY(a) ( - PARTITION pt1 COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r2", + PARTITION pt1 COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r2", priority "1000"', - PARTITION pt2 COMMENT='srv "s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000001"' + PARTITION pt2 COMMENT='srv "s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000001"' ); let $MASTER_1_COMMENT2_P_2_1= COMMENT='table "ta_r3"' PARTITION BY RANGE(a) ( - PARTITION pt1 VALUES LESS THAN (4) COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", + PARTITION pt1 VALUES LESS THAN (4) COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r2", priority "1000"', PARTITION pt2 VALUES LESS THAN MAXVALUE - COMMENT='srv "s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000001"' + COMMENT='srv "s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000001"' ); let $MASTER_1_COMMENT3_2_1= - COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r_auto_inc", + COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r_auto_inc", wrapper "odbc_mariadb"'; let $MASTER_1_COMMENT3_P_2_1= COMMENT='table "s_2_1_ta_r_int"' PARTITION BY LIST(MOD(a, 2)) ( PARTITION pt1 VALUES IN (0) - COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000"', + COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000"', PARTITION pt2 VALUES IN (1) - COMMENT='srv "s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000001", + COMMENT='srv "s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000001", table "s_2_2_ta_r_int"' ); let $MASTER_1_COMMENT4_2_1= - COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "s_2_1_ta_r_int", + COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "s_2_1_ta_r_int", wrapper "odbc_mariadb"'; let $MASTER_1_COMMENT5_2_1= - COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r_3", wrapper "odbc_mariadb"'; + COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r_3", wrapper "odbc_mariadb"'; let $MASTER_1_COMMENT_FT_2_1= - COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ft_r", wrapper "odbc_mariadb"'; + COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ft_r", wrapper "odbc_mariadb"'; let $MASTER_1_COMMENT2_FT_P_2_1= COMMENT='table "ft_r3"' PARTITION BY RANGE(a) ( - PARTITION pt1 VALUES LESS THAN (4) COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", + PARTITION pt1 VALUES LESS THAN (4) COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ft_r2", priority "1000"', PARTITION pt2 VALUES LESS THAN MAXVALUE - COMMENT='srv "s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000001"' + COMMENT='srv "s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000001"' ); let $MASTER_1_COMMENT_GM_2_1= - COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "gm_r"'; + COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "gm_r"'; let $MASTER_1_COMMENT2_GM_P_2_1= COMMENT='table "gm_r3"' PARTITION BY RANGE(a) ( - PARTITION pt1 VALUES LESS THAN (4) COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", + PARTITION pt1 VALUES LESS THAN (4) COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "gm_r2", priority "1000"', PARTITION pt2 VALUES LESS THAN MAXVALUE - COMMENT='srv "s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000001"' + COMMENT='srv "s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", priority "1000001"' ); let $MASTER_1_COMMENT_LOCK1= - COMMENT 'tbl "t1_1 t1_2", srv "s_2_1 s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + COMMENT 'tbl "t1_1 t1_2", srv "s_2_1 s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $MASTER_1_COMMENT_LOCK2= - COMMENT 'tbl "t2_1 t2_2", srv "s_2_2 s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + COMMENT 'tbl "t2_1 t2_2", srv "s_2_2 s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $MASTER_1_COMMENT_INCREMENT1_1= - COMMENT 'aim "0", tbl "t1_1", srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + COMMENT 'aim "0", tbl "t1_1", srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $MASTER_1_COMMENT_INCREMENT1_P_1= COMMENT 'aim "0"' PARTITION BY LIST(MOD(id, 2)) ( PARTITION pt1 VALUES IN (0) - COMMENT='tbl "t1_1", srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"', + COMMENT='tbl "t1_1", srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"', PARTITION pt2 VALUES IN (1) - COMMENT='tbl "t1_2", srv "s_2_2", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"' + COMMENT='tbl "t1_2", srv "s_2_2", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"' ); let $MASTER_1_COMMENT_READONLY1_1= - COMMENT 'read_only_mode "1", tbl "t1_1", srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + COMMENT 'read_only_mode "1", tbl "t1_1", srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $MASTER_1_COMMENT_ERROR_MODE1_1= - COMMENT 'erm "1", ewm "1", tbl "ter1_1", srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + COMMENT 'erm "1", ewm "1", tbl "ter1_1", srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $MASTER_1_COMMENT_TEXT_PK1_1= - COMMENT 'tbl "t1", srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + COMMENT 'tbl "t1", srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $MASTER_1_COMMENT_TEXT_KEY1_1= - COMMENT 'tbl "t1", srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; + COMMENT 'tbl "t1", srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver"'; let $MASTER_1_CHECK_DIRECT_UPDATE_STATUS= SHOW GLOBAL STATUS LIKE 'Spider_direct_update%'; let $MASTER_1_CHECK_DIRECT_DELETE_STATUS= @@ -91,40 +91,40 @@ let $MASTER_1_CHECK_DIRECT_AGGREGATE_STATUS= SHOW GLOBAL STATUS LIKE 'Spider_direct_aggregate%'; let $MASTER_1_AUTO_INCREMENT_INCREMENT1= SET SESSION AUTO_INCREMENT_INCREMENT = 1 $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $MASTER_1_AUTO_INCREMENT_INCREMENT2= SET SESSION AUTO_INCREMENT_INCREMENT = 777 $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $MASTER_1_AUTO_INCREMENT_OFFSET1= SET SESSION AUTO_INCREMENT_OFFSET = 1 $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 1', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 1', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $MASTER_1_AUTO_INCREMENT_OFFSET2= SET SESSION AUTO_INCREMENT_OFFSET = 777 $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') $STR_SEMICOLON - SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); + SELECT spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); let $MASTER_1_AUTO_INCREMENT_OFFSET3= SET SESSION AUTO_INCREMENT_OFFSET = 1; let $MASTER_1_AUTO_INCREMENT_OFFSET4= diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/ment_805_deinit.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/ment_805_deinit.inc index ee822b50a38..408961bfc36 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/include/ment_805_deinit.inc +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/ment_805_deinit.inc @@ -1,6 +1,6 @@ let $MASTER_1_COMMENT_2_1= $MASTER_1_COMMENT_2_1_BACKUP; -SELECT spider_direct_sql('DROP USER tu@\'%\'', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver", database ""'); +SELECT spider_direct_sql('DROP USER tu@\'%\'', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver", database ""'); --disable_query_log --disable_result_log diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/include/ment_805_init.inc b/storage/spider/mysql-test/spider/odbc/mariadb/include/ment_805_init.inc index 9ae84ddee59..b4970294702 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/include/ment_805_init.inc +++ b/storage/spider/mysql-test/spider/odbc/mariadb/include/ment_805_init.inc @@ -4,8 +4,8 @@ --enable_result_log --enable_query_log -SELECT spider_direct_sql('GRANT ALL ON *.* TO tu@\'%\' IDENTIFIED BY \');{(\'', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver", database ""'); +SELECT spider_direct_sql('GRANT ALL ON *.* TO tu@\'%\' IDENTIFIED BY \');{(\'', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver", database ""'); let $MASTER_1_COMMENT_2_1_BACKUP= $MASTER_1_COMMENT_2_1; let $MASTER_1_COMMENT_2_1= - COMMENT='srv "s_2_1", default_group "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r", wrapper "odbc_mariadb", user "tu", password ");{("'; + COMMENT='srv "s_2_1", driver "MariaDB\\\\ ODBC\\\\ 3.0\\\\ Driver", table "ta_r", wrapper "odbc_mariadb", user "tu", password ");{("'; diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/basic_sql.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/basic_sql.result index 3b1b8ebf679..3309f47f498 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/basic_sql.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/basic_sql.result @@ -10,23 +10,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -728,11 +728,11 @@ a b date_format(c, '%Y-%m-%d %H:%i:%s') deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for child3 for child2 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/basic_sql_part.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/basic_sql_part.result index 43683423662..f918996dba5 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/basic_sql_part.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/basic_sql_part.result @@ -10,23 +10,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -131,11 +131,11 @@ a b date_format(c, '%Y-%m-%d %H:%i:%s') deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for child3 for child2 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/bgs_mode_2.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/bgs_mode_2.result index 0a82a4606d0..86eea8df4a6 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/bgs_mode_2.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/bgs_mode_2.result @@ -10,23 +10,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -58,11 +58,11 @@ a b date_format(c, '%Y-%m-%d %H:%i:%s') deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for child3 for child2 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_aggregate.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_aggregate.result index b4ce8f4c5c5..c973c2c1756 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_aggregate.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_aggregate.result @@ -10,23 +10,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -90,11 +90,11 @@ Spider_direct_aggregate 5 deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for child3 for child2 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_aggregate_part.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_aggregate_part.result index 088a3e6c850..d2a8da1e9a0 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_aggregate_part.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_aggregate_part.result @@ -10,23 +10,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -80,11 +80,11 @@ Spider_direct_aggregate 10 deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for child3 for child2 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_update.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_update.result index b072fb8bbd8..9799f520a25 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_update.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_update.result @@ -10,23 +10,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -145,11 +145,11 @@ a b date_format(c, '%Y-%m-%d %H:%i:%s') deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for child3 for child2 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_update_part.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_update_part.result index 520af7497b1..2c16fd195c1 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_update_part.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/direct_update_part.result @@ -10,23 +10,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -135,11 +135,11 @@ a b date_format(c, '%Y-%m-%d %H:%i:%s') deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for child3 for child2 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/filedsn.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/filedsn.result new file mode 100644 index 00000000000..25bacdbbc72 --- /dev/null +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/filedsn.result @@ -0,0 +1,80 @@ +for master_1 +for child2 +child2_1 +child2_2 +child2_3 +for child3 + +drop and create databases +connection master_1; +DROP DATABASE IF EXISTS auto_test_local; +CREATE DATABASE auto_test_local; +USE auto_test_local; +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') +1 +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') +1 +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') +1 +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') +1 +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') +1 +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') +1 + +test select 1 +connection master_1; +SELECT 1; +1 +1 + +create table select test +connection master_1; +DROP TABLE IF EXISTS ta_l; +CREATE TABLE ta_l ( +a INT, +b CHAR(1), +c DATETIME, +PRIMARY KEY(a) +) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1 +INSERT INTO ta_l (a, b, c) VALUES +(1, 'a', '2008-08-01 10:21:39'), +(2, 'b', '2000-01-01 00:00:00'), +(3, 'e', '2007-06-04 20:03:11'), +(4, 'd', '2003-11-30 05:01:03'), +(5, 'c', '2001-12-31 23:59:59'); + +connection master_1; +SELECT * FROM ta_l ORDER BY a; +a b c +1 a 2008-08-01 00:00:00 +2 b 2000-01-01 00:00:00 +3 e 2007-06-04 00:00:00 +4 d 2003-11-30 00:00:00 +5 c 2001-12-31 00:00:00 +SPIDER_DIRECT_SQL_1 + +deinit +connection master_1; +DROP DATABASE IF EXISTS auto_test_local; +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') +1 +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') +1 +for child3 +for child2 +child2_3 +child2_2 +child2_1 +for master_1 + +end of test diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/function.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/function.result index c619140625e..fefb9773936 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/function.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/function.result @@ -10,23 +10,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -150,11 +150,11 @@ a b date_format(c, '%Y-%m-%d %H:%i:%s') deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for child3 for child2 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/ha.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/ha.result index 10bc18a8a68..756baf0ac62 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/ha.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/ha.result @@ -22,32 +22,32 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"') 1 connection child3_1; DROP DATABASE IF EXISTS auto_test_local; @@ -160,6 +160,8 @@ spider_tables CREATE TABLE `spider_tables` ( `default_file` text COLLATE utf8_bin DEFAULT NULL, `default_group` char(64) COLLATE utf8_bin DEFAULT NULL, `dsn` char(64) COLLATE utf8_bin DEFAULT NULL, + `filedsn` text COLLATE utf8_bin DEFAULT NULL, + `driver` char(64) COLLATE utf8_bin DEFAULT NULL, `tgt_db_name` char(64) COLLATE utf8_bin DEFAULT NULL, `tgt_table_name` char(64) COLLATE utf8_bin DEFAULT NULL, `link_status` tinyint(4) NOT NULL DEFAULT 1, @@ -170,9 +172,9 @@ spider_tables CREATE TABLE `spider_tables` ( KEY `idx1` (`priority`) ) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 select * from mysql.spider_tables; -db_name table_name link_id priority server scheme host port socket username password ssl_ca ssl_capath ssl_cert ssl_cipher ssl_key ssl_verify_server_cert monitoring_binlog_pos_at_failing default_file default_group dsn tgt_db_name tgt_table_name link_status block_status static_link_id -auto_test_local ta_l 0 1000000 s_2_1 odbc_mariadb NULL 0 0 MariaDB ODBC 3.0 Driver auto_test_remote ta_r 1 0 NULL -auto_test_local ta_l 1 1000000 s_2_2 odbc_mariadb NULL 0 0 MariaDB ODBC 3.0 Driver auto_test_remote2 ta_r3 2 0 NULL +db_name table_name link_id priority server scheme host port socket username password ssl_ca ssl_capath ssl_cert ssl_cipher ssl_key ssl_verify_server_cert monitoring_binlog_pos_at_failing default_file default_group dsn filedsn driver tgt_db_name tgt_table_name link_status block_status static_link_id +auto_test_local ta_l 0 1000000 s_2_1 odbc_mariadb NULL 0 0 MariaDB ODBC 3.0 Driver auto_test_remote ta_r 1 0 NULL +auto_test_local ta_l 1 1000000 s_2_2 odbc_mariadb NULL 0 0 MariaDB ODBC 3.0 Driver auto_test_remote2 ta_r3 2 0 NULL SELECT spider_copy_tables('ta_l', '0', '1'); spider_copy_tables('ta_l', '0', '1') 1 @@ -279,14 +281,14 @@ spider_flush_table_mon_cache() deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote3', '', 'srv "s_2_3", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote3', '', 'srv "s_2_3", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote3', '', 'srv "s_2_3", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote3', '', 'srv "s_2_3", driver "MariaDB ODBC 3.0 Driver"') 1 connection child3_1; DROP DATABASE IF EXISTS auto_test_local; diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/ha_part.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/ha_part.result index 17b6ab7b3df..b3c816551fc 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/ha_part.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/ha_part.result @@ -22,32 +22,32 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote3', '', 'srv "s_2_3_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote3', '', 'srv "s_2_3_test", driver "MariaDB ODBC 3.0 Driver"') 1 connection child3_1; DROP DATABASE IF EXISTS auto_test_local; @@ -133,9 +133,9 @@ recovery test connection master_1; ALTER TABLE ta_l2 PARTITION BY KEY(a) ( -PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r ta_r3", +PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r ta_r3", priority "1000"', -PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r2 ta_r4", +PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "0 2"' ); SELECT db_name, table_name, link_id, link_status FROM mysql.spider_tables @@ -151,9 +151,9 @@ spider_copy_tables('ta_l2#P#pt2', '0', '1') connection master_1; ALTER TABLE ta_l2 PARTITION BY KEY(a) ( -PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r ta_r3", +PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r ta_r3", priority "1000"', -PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r2 ta_r4", +PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "0 1"' ); SELECT db_name, table_name, link_id, link_status FROM mysql.spider_tables @@ -242,9 +242,9 @@ recovery test connection master_1; ALTER TABLE ta_l2 PARTITION BY KEY(a) ( -PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", default_group "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r ta_r3", +PARTITION pt1 COMMENT='srv "s_2_1 s_2_2", driver "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r ta_r3", priority "1000"', -PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", default_group "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r2 ta_r4", +PARTITION pt2 COMMENT='srv "s_2_1 s_2_3", driver "MariaDB\\ ODBC\\ 3.0\\ Driver", tbl "ta_r2 ta_r4", priority "1000001", lst "1 0"' ); SELECT db_name, table_name, link_id, link_status FROM mysql.spider_tables @@ -269,14 +269,14 @@ DROP TABLE ta_l2; deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote3', '', 'srv "s_2_3", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote3', '', 'srv "s_2_3", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote3', '', 'srv "s_2_3", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote3', '', 'srv "s_2_3", driver "MariaDB ODBC 3.0 Driver"') 1 connection child3_1; DROP DATABASE IF EXISTS auto_test_local; diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/ment_805.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/ment_805.result index 7b0943dfdb3..917b2e40684 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/ment_805.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/ment_805.result @@ -4,8 +4,8 @@ child2_1 child2_2 child2_3 for child3 -SELECT spider_direct_sql('GRANT ALL ON *.* TO tu@\'%\' IDENTIFIED BY \');{(\'', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver", database ""'); -spider_direct_sql('GRANT ALL ON *.* TO tu@\'%\' IDENTIFIED BY \');{(\'', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver", database ""') +SELECT spider_direct_sql('GRANT ALL ON *.* TO tu@\'%\' IDENTIFIED BY \');{(\'', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver", database ""'); +spider_direct_sql('GRANT ALL ON *.* TO tu@\'%\' IDENTIFIED BY \');{(\'', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver", database ""') 1 drop and create databases @@ -13,23 +13,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -57,14 +57,14 @@ INSERT INTO ta_l (a, b, c) VALUES deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP USER tu@\'%\'', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver", database ""'); -spider_direct_sql('DROP USER tu@\'%\'', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver", database ""') +SELECT spider_direct_sql('DROP USER tu@\'%\'', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver", database ""'); +spider_direct_sql('DROP USER tu@\'%\'', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver", database ""') 1 for child3 for child2 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/spider3_fixes.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/spider3_fixes.result index c10d18deba3..2ab2f0d9260 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/spider3_fixes.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/spider3_fixes.result @@ -11,23 +11,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -50,21 +50,21 @@ PRIMARY KEY (id) ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_INCREMENT1_1 MASTER_1_AUTO_INCREMENT_INCREMENT2 MASTER_1_AUTO_INCREMENT_OFFSET2 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 INSERT INTO t1 () VALUES (); SELECT LAST_INSERT_ID(); @@ -191,11 +191,11 @@ MAX(id) deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for slave1_1 for child3 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/spider3_fixes_part.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/spider3_fixes_part.result index c6fb7369ab8..4fa88193744 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/spider3_fixes_part.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/spider3_fixes_part.result @@ -11,23 +11,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -48,21 +48,21 @@ PRIMARY KEY (id) ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_INCREMENT1_P_1 MASTER_1_AUTO_INCREMENT_INCREMENT2 MASTER_1_AUTO_INCREMENT_OFFSET2 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 INSERT INTO t1 () VALUES (); SELECT LAST_INSERT_ID(); @@ -189,11 +189,11 @@ MAX(id) deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for slave1_1 for child3 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/spider_fixes.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/spider_fixes.result index 29d8b8fc795..64aab936b75 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/spider_fixes.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/spider_fixes.result @@ -11,23 +11,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -307,21 +307,21 @@ PRIMARY KEY (id) ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_INCREMENT1_1 MASTER_1_AUTO_INCREMENT_INCREMENT2 MASTER_1_AUTO_INCREMENT_OFFSET2 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 INSERT INTO t1 () VALUES (); SELECT LAST_INSERT_ID(); @@ -546,11 +546,11 @@ a c deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for slave1_1 for child3 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/spider_fixes_part.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/spider_fixes_part.result index b4f96494565..b0823a154dd 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/spider_fixes_part.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/spider_fixes_part.result @@ -11,23 +11,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -119,21 +119,21 @@ PRIMARY KEY (id) ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_INCREMENT1_P_1 MASTER_1_AUTO_INCREMENT_INCREMENT2 MASTER_1_AUTO_INCREMENT_OFFSET2 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 2', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('SET SESSION AUTO_INCREMENT_OFFSET = 3', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 INSERT INTO t1 () VALUES (); SELECT LAST_INSERT_ID(); @@ -203,11 +203,11 @@ MAX(id) deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for slave1_1 for child3 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/r/vp_fixes.result b/storage/spider/mysql-test/spider/odbc/mariadb/r/vp_fixes.result index e38ca7bba17..40eb63acf9c 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/r/vp_fixes.result +++ b/storage/spider/mysql-test/spider/odbc/mariadb/r/vp_fixes.result @@ -10,23 +10,23 @@ connection master_1; DROP DATABASE IF EXISTS auto_test_local; CREATE DATABASE auto_test_local; USE auto_test_local; -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote', '', 'srv "s_2_1_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE IF EXISTS auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') ; -SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') ; +SELECT spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('CREATE DATABASE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 -spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", default_group "MariaDB ODBC 3.0 Driver"') +spider_direct_sql('USE auto_test_remote2', '', 'srv "s_2_2_test", driver "MariaDB ODBC 3.0 Driver"') 1 test select 1 @@ -83,11 +83,11 @@ INSERT INTO ta_l_int (a, b, c) VALUES (2, NULL, 3); deinit connection master_1; DROP DATABASE IF EXISTS auto_test_local; -SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote', '', 'srv "s_2_1", driver "MariaDB ODBC 3.0 Driver"') 1 -SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"'); -spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", default_group "MariaDB ODBC 3.0 Driver"') +SELECT spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"'); +spider_direct_sql('DROP DATABASE auto_test_remote2', '', 'srv "s_2_2", driver "MariaDB ODBC 3.0 Driver"') 1 for child3 for child2 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/t/filedsn.cnf b/storage/spider/mysql-test/spider/odbc/mariadb/t/filedsn.cnf new file mode 100644 index 00000000000..a5f020b06e6 --- /dev/null +++ b/storage/spider/mysql-test/spider/odbc/mariadb/t/filedsn.cnf @@ -0,0 +1,7 @@ +!include include/default_mysqld.cnf +!include ../my_1_1.cnf +!include ../my_2_1.cnf +!include ../my_2_2.cnf +!include ../my_2_3.cnf +[ENV] +USE_CHILD_GROUP2= 1 diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/t/filedsn.test b/storage/spider/mysql-test/spider/odbc/mariadb/t/filedsn.test new file mode 100644 index 00000000000..065f00313b6 --- /dev/null +++ b/storage/spider/mysql-test/spider/odbc/mariadb/t/filedsn.test @@ -0,0 +1,132 @@ +--disable_warnings +--source ../include/filedsn_init.inc + +--echo +--echo drop and create databases +--connection master_1 +DROP DATABASE IF EXISTS auto_test_local; +CREATE DATABASE auto_test_local; +USE auto_test_local; +if ($USE_CHILD_GROUP2) +{ + eval $CHILD2_1_DROP_DATABASE_IFEXISTS; + eval $CHILD2_1_CREATE_DATABASE; + eval $CHILD2_2_DROP_DATABASE_IFEXISTS; + eval $CHILD2_2_CREATE_DATABASE; +} +--enable_warnings + +--echo +--echo test select 1 +--connection master_1 +SELECT 1; +if ($USE_CHILD_GROUP2) +{ + if (!$OUTPUT_CHILD_GROUP2) + { + --disable_query_log + --disable_result_log + } + eval $CHILD2_1_DATEFORMAT; + eval $CHILD2_1_SELECT1; + eval $CHILD2_2_DATEFORMAT; + eval $CHILD2_2_SELECT1; + if (!$OUTPUT_CHILD_GROUP2) + { + --enable_query_log + --enable_result_log + } +} + +--echo +--echo create table select test +if ($USE_CHILD_GROUP2) +{ + if (!$OUTPUT_CHILD_GROUP2) + { + --disable_query_log + --disable_result_log + } + if ($OUTPUT_CHILD_GROUP2) + { + --disable_query_log + echo CHILD2_1_DROP_TABLES; + echo CHILD2_1_CREATE_TABLES; + } + --disable_warnings + eval $CHILD2_1_DROP_TABLES; + --enable_warnings + eval $CHILD2_1_CREATE_TABLES; + if ($OUTPUT_CHILD_GROUP2) + { + --enable_query_log + } + if (!$OUTPUT_CHILD_GROUP2) + { + --enable_query_log + --enable_result_log + } +} +--connection master_1 +--disable_warnings +DROP TABLE IF EXISTS ta_l; +--enable_warnings +--disable_query_log +echo CREATE TABLE ta_l ( + a INT, + b CHAR(1), + c DATETIME, + PRIMARY KEY(a) +) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1; +eval CREATE TABLE ta_l ( + a INT, + b CHAR(1), + c DATETIME, + PRIMARY KEY(a) +) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_2_1; +--enable_query_log +INSERT INTO ta_l (a, b, c) VALUES + (1, 'a', '2008-08-01 10:21:39'), + (2, 'b', '2000-01-01 00:00:00'), + (3, 'e', '2007-06-04 20:03:11'), + (4, 'd', '2003-11-30 05:01:03'), + (5, 'c', '2001-12-31 23:59:59'); + +--echo +--connection master_1 +SELECT * FROM ta_l ORDER BY a; +echo SPIDER_DIRECT_SQL_1; +--disable_query_log +--disable_result_log +eval $SPIDER_DIRECT_SQL_1; +--enable_query_log +--enable_result_log +if ($USE_CHILD_GROUP2) +{ + if (!$OUTPUT_CHILD_GROUP2) + { + --disable_query_log + --disable_result_log + } + eval $CHILD2_1_SELECT_TABLES; + if (!$OUTPUT_CHILD_GROUP2) + { + --enable_query_log + --enable_result_log + } +} + +--echo +--echo deinit +--disable_warnings +--connection master_1 +DROP DATABASE IF EXISTS auto_test_local; +if ($USE_CHILD_GROUP2) +{ + eval $CHILD2_1_DROP_DATABASE; + eval $CHILD2_2_DROP_DATABASE; +} +--source ../include/filedsn_deinit.inc +--enable_warnings +--echo +--echo end of test diff --git a/storage/spider/mysql-test/spider/odbc/mariadb/t/have_odbc.inc b/storage/spider/mysql-test/spider/odbc/mariadb/t/have_odbc.inc index ff91838961e..7b5fac727bc 100644 --- a/storage/spider/mysql-test/spider/odbc/mariadb/t/have_odbc.inc +++ b/storage/spider/mysql-test/spider/odbc/mariadb/t/have_odbc.inc @@ -4,7 +4,7 @@ CREATE TABLE ta_l ( b CHAR(1), c DATETIME, PRIMARY KEY(a) -) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='database "test", port "$CHILD2_1_MYPORT", host "localhost", user "root", password "", default_group "MariaDB ODBC 3.0 Driver", table "ta_r", wrapper "odbc_mariadb"'; +) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='database "test", port "$CHILD2_1_MYPORT", host "localhost", user "root", password "", driver "MariaDB ODBC 3.0 Driver", table "ta_r", wrapper "odbc_mariadb"'; if ($mysql_errno) { --skip Test requires to build with ODBC driver diff --git a/storage/spider/spd_db_conn.h b/storage/spider/spd_db_conn.h index 30c54b0059b..d6dbbcc8b27 100644 --- a/storage/spider/spd_db_conn.h +++ b/storage/spider/spd_db_conn.h @@ -20,8 +20,17 @@ #define SPIDER_DB_ODBC_LEN (sizeof(SPIDER_DB_ODBC_STR) - 1) #define SPIDER_DB_DRIVER_STR "driver" #define SPIDER_DB_DRIVER_LEN (sizeof(SPIDER_DB_DRIVER_STR) - 1) +#define SPIDER_DB_FILEDSN_STR "filedsn" +#define SPIDER_DB_FILEDSN_LEN (sizeof(SPIDER_DB_FILEDSN_STR) - 1) #define SPIDER_DB_DSN_STR "dsn" #define SPIDER_DB_DSN_LEN (sizeof(SPIDER_DB_DSN_STR) - 1) +#define SPIDER_DB_SERVER_STR "server" +#define SPIDER_DB_SERVER_LEN (sizeof(SPIDER_DB_SERVER_STR) - 1) +#define SPIDER_DB_SOCKET_STR "socket" +#define SPIDER_DB_SOCKET_LEN (sizeof(SPIDER_DB_SOCKET_STR) - 1) +#define SPIDER_DB_PORT_STR "port" +#define SPIDER_DB_PORT_LEN (sizeof(SPIDER_DB_PORT_STR) - 1) + #define SPIDER_DB_PK_NAME_STR "PRIMARY" #define SPIDER_DB_PK_NAME_LEN (sizeof(SPIDER_DB_PK_NAME_STR) - 1) #define SPIDER_DB_UNIQUE_NAME_STR "UNIQUE" diff --git a/storage/spider/spd_db_odbc.cc b/storage/spider/spd_db_odbc.cc index 5d4e331e8cb..27920532e4f 100644 --- a/storage/spider/spd_db_odbc.cc +++ b/storage/spider/spd_db_odbc.cc @@ -1254,11 +1254,14 @@ int spider_db_odbc::connect( SQLRETURN ret; SQLUINTEGER login_tmo; SQLUINTEGER net_tmo; - bool use_driver; - bool use_dir; + bool use_filedsn; bool use_dsn; + bool use_driver; bool use_db; bool use_uid; + bool use_socket; + bool use_server; + bool use_port; uint conn_str_len; SQLSMALLINT dummy_len; uchar *conn_str; @@ -1319,41 +1322,55 @@ int spider_db_odbc::connect( } } + net_tmo = conn->net_read_timeout > conn->net_write_timeout ? + conn->net_read_timeout : conn->net_write_timeout; + (void) SQLSetConnectAttr(hdbc, SQL_ATTR_CONNECTION_TIMEOUT, + (SQLPOINTER) (SQLULEN) net_tmo, SQL_IS_UINTEGER); + /* create connect string */ - use_driver = conn->tgt_default_group_length ? TRUE : FALSE; - DBUG_PRINT("info",("spider use_driver:%s", use_driver ? "TRUE" : "FALSE")); - use_dir = conn->tgt_default_file_length ? TRUE : FALSE; - DBUG_PRINT("info",("spider use_dir:%s", use_dir ? "TRUE" : "FALSE")); + use_filedsn = conn->tgt_filedsn_length ? TRUE : FALSE; + DBUG_PRINT("info",("spider use_filedsn:%s", use_filedsn ? "TRUE" : "FALSE")); use_dsn = conn->tgt_dsn_length ? TRUE : FALSE; DBUG_PRINT("info",("spider use_dsn:%s", use_dsn ? "TRUE" : "FALSE")); + use_driver = conn->tgt_driver_length ? TRUE : FALSE; + DBUG_PRINT("info",("spider use_driver:%s", use_driver ? "TRUE" : "FALSE")); + use_server = conn->tgt_host_length ? TRUE : FALSE; + DBUG_PRINT("info",("spider use_server:%s", use_server ? "TRUE" : "FALSE")); + use_socket = conn->tgt_socket_length ? TRUE : FALSE; + DBUG_PRINT("info",("spider use_socket:%s", use_socket ? "TRUE" : "FALSE")); + use_port = conn->tgt_port ? TRUE : FALSE; + DBUG_PRINT("info",("spider use_port:%s", use_port ? "TRUE" : "FALSE")); use_db = conn->tgt_db_length ? TRUE : FALSE; DBUG_PRINT("info",("spider use_db:%s", use_db ? "TRUE" : "FALSE")); use_uid = conn->tgt_username_length ? TRUE : FALSE; DBUG_PRINT("info",("spider use_uid:%s", use_uid ? "TRUE" : "FALSE")); dummy_len = 0; conn_str_len = - (use_driver ? - (SPIDER_DB_DRIVER_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + - SPIDER_SQL_OPEN_BRACE_LEN + conn->tgt_default_group_length * 2 + - SPIDER_SQL_CLOSE_BRACE_LEN + SPIDER_SQL_SEMICOLON_LEN + - (use_dir ? - (SPIDER_DB_DIRECTORY_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + - SPIDER_SQL_OPEN_BRACE_LEN + SPIDER_SQL_CLOSE_BRACE_LEN + - conn->tgt_default_file_length * 2 + SPIDER_SQL_SEMICOLON_LEN - ) : - 0) - ) : - 0) + + (use_filedsn ? + (SPIDER_DB_FILEDSN_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + + conn->tgt_filedsn_length + SPIDER_SQL_SEMICOLON_LEN) : 0) + (use_dsn ? (SPIDER_DB_DSN_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + conn->tgt_dsn_length + SPIDER_SQL_SEMICOLON_LEN) : 0) + + (use_driver ? + (SPIDER_DB_DRIVER_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + + SPIDER_SQL_OPEN_BRACE_LEN + conn->tgt_driver_length * 2 + + SPIDER_SQL_CLOSE_BRACE_LEN + SPIDER_SQL_SEMICOLON_LEN) : 0) + + (use_server ? + (SPIDER_DB_SERVER_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + + SPIDER_SQL_OPEN_BRACE_LEN + SPIDER_SQL_CLOSE_BRACE_LEN + + conn->tgt_host_length * 2 + SPIDER_SQL_SEMICOLON_LEN) : 0) + + (use_socket ? + (SPIDER_DB_SOCKET_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + + SPIDER_SQL_OPEN_BRACE_LEN + SPIDER_SQL_CLOSE_BRACE_LEN + + conn->tgt_socket_length * 2 + SPIDER_SQL_SEMICOLON_LEN) : 0) + + (use_port ? + (SPIDER_DB_PORT_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + + /* conn->tgt_port_length */ 5 + SPIDER_SQL_SEMICOLON_LEN) : 0) + (use_db ? (SPIDER_SQL_DATABASE_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + SPIDER_SQL_OPEN_BRACE_LEN + SPIDER_SQL_CLOSE_BRACE_LEN + - conn->tgt_db_length * 2 + SPIDER_SQL_COLON_LEN + - conn->tgt_host_length * 2 + - SPIDER_SQL_COLON_LEN + /* conn->tgt_port_length */ 5 + - SPIDER_SQL_SEMICOLON_LEN) : 0) + + conn->tgt_db_length * 2 + SPIDER_SQL_SEMICOLON_LEN) : 0) + (use_uid ? (SPIDER_SQL_UID_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + SPIDER_SQL_OPEN_BRACE_LEN + SPIDER_SQL_CLOSE_BRACE_LEN + @@ -1382,9 +1399,42 @@ int spider_db_odbc::connect( tmp_str += conn->tgt_ssl_ca_length; } + if (use_filedsn) + { + DBUG_PRINT("info",("spider filedsn:%s", conn->tgt_filedsn)); + memcpy(tmp_str, SPIDER_DB_FILEDSN_STR, SPIDER_DB_FILEDSN_LEN); + tmp_str += SPIDER_DB_FILEDSN_LEN; + memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); + tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; + memcpy(tmp_str, conn->tgt_filedsn, conn->tgt_filedsn_length); + tmp_str += conn->tgt_filedsn_length; + memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); + tmp_str += SPIDER_SQL_SEMICOLON_LEN; + } + + if (use_dsn) + { + DBUG_PRINT("info",("spider dsn:%s", conn->tgt_dsn)); + memcpy(tmp_str, SPIDER_DB_DSN_STR, SPIDER_DB_DSN_LEN); + tmp_str += SPIDER_DB_DSN_LEN; + memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); + tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; + memcpy(tmp_str, conn->tgt_dsn, conn->tgt_dsn_length); + tmp_str += conn->tgt_dsn_length; + memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); + tmp_str += SPIDER_SQL_SEMICOLON_LEN; + } + + /* additional connect parameter for ODBC */ + if (conn->tgt_ssl_capath_length) + { + memcpy(tmp_str, conn->tgt_ssl_capath, conn->tgt_ssl_capath_length); + tmp_str += conn->tgt_ssl_capath_length; + } + if (use_driver) { - DBUG_PRINT("info",("spider driver:%s", conn->tgt_default_group)); + DBUG_PRINT("info",("spider driver:%s", conn->tgt_driver)); memcpy(tmp_str, SPIDER_DB_DRIVER_STR, SPIDER_DB_DRIVER_LEN); tmp_str += SPIDER_DB_DRIVER_LEN; memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); @@ -1393,46 +1443,55 @@ int spider_db_odbc::connect( tmp_str += SPIDER_SQL_OPEN_BRACE_LEN; tmp_str = spider_duplicate_char( tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), - (uchar *) conn->tgt_default_group, conn->tgt_default_group_length); + (uchar *) conn->tgt_driver, conn->tgt_driver_length); memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); tmp_str += SPIDER_SQL_SEMICOLON_LEN; - if (use_dir) - { - DBUG_PRINT("info",("spider dir:%s", conn->tgt_default_file)); - memcpy(tmp_str, SPIDER_DB_DIRECTORY_STR, SPIDER_DB_DIRECTORY_LEN); - tmp_str += SPIDER_DB_DIRECTORY_LEN; - memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); - tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; - memcpy(tmp_str, SPIDER_SQL_OPEN_BRACE_STR, SPIDER_SQL_OPEN_BRACE_LEN); - tmp_str += SPIDER_SQL_OPEN_BRACE_LEN; - tmp_str = spider_duplicate_char( - tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), - (uchar *) conn->tgt_default_file, conn->tgt_default_file_length); - memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); - tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; - memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); - tmp_str += SPIDER_SQL_SEMICOLON_LEN; - } } - /* additional connect parameter for ODBC */ - if (conn->tgt_ssl_capath_length) + if (use_server) { - memcpy(tmp_str, conn->tgt_ssl_capath, conn->tgt_ssl_capath_length); - tmp_str += conn->tgt_ssl_capath_length; + memcpy(tmp_str, SPIDER_DB_SERVER_STR, SPIDER_DB_SERVER_LEN); + tmp_str += SPIDER_DB_SERVER_LEN; + memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); + tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; + memcpy(tmp_str, SPIDER_SQL_OPEN_BRACE_STR, SPIDER_SQL_OPEN_BRACE_LEN); + tmp_str += SPIDER_SQL_OPEN_BRACE_LEN; + tmp_str = spider_duplicate_char( + tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), + (uchar *) conn->tgt_host, conn->tgt_host_length); + memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); + tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; + memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); + tmp_str += SPIDER_SQL_SEMICOLON_LEN; } - if (use_dsn) + if (use_socket) { - DBUG_PRINT("info",("spider dsn:%s", conn->tgt_dsn)); - memcpy(tmp_str, SPIDER_DB_DSN_STR, SPIDER_DB_DSN_LEN); - tmp_str += SPIDER_DB_DSN_LEN; + memcpy(tmp_str, SPIDER_DB_SOCKET_STR, SPIDER_DB_SOCKET_LEN); + tmp_str += SPIDER_DB_SOCKET_LEN; memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; - memcpy(tmp_str, conn->tgt_dsn, conn->tgt_dsn_length); - tmp_str += conn->tgt_dsn_length; + memcpy(tmp_str, SPIDER_SQL_OPEN_BRACE_STR, SPIDER_SQL_OPEN_BRACE_LEN); + tmp_str += SPIDER_SQL_OPEN_BRACE_LEN; + tmp_str = spider_duplicate_char( + tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), + (uchar *) conn->tgt_socket, conn->tgt_socket_length); + memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); + tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; + memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); + tmp_str += SPIDER_SQL_SEMICOLON_LEN; + } + + if (use_port) + { + memcpy(tmp_str, SPIDER_DB_PORT_STR, SPIDER_DB_PORT_LEN); + tmp_str += SPIDER_DB_PORT_LEN; + memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); + tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; + my_sprintf((char *) tmp_str, ((char *) tmp_str, "%05ld", conn->tgt_port)); + tmp_str += /* conn->tgt_port_length */ 5; memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); tmp_str += SPIDER_SQL_SEMICOLON_LEN; } @@ -1456,15 +1515,6 @@ int spider_db_odbc::connect( tmp_str = spider_duplicate_char( tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), (uchar *) conn->tgt_db, conn->tgt_db_length); - memcpy(tmp_str, SPIDER_SQL_COLON_STR, SPIDER_SQL_COLON_LEN); - tmp_str += SPIDER_SQL_COLON_LEN; - tmp_str = spider_duplicate_char( - tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), - (uchar *) conn->tgt_host, conn->tgt_host_length); - memcpy(tmp_str, SPIDER_SQL_COLON_STR, SPIDER_SQL_COLON_LEN); - tmp_str += SPIDER_SQL_COLON_LEN; - my_sprintf((char *) tmp_str, ((char *) tmp_str, "%05ld", conn->tgt_port)); - tmp_str += /* conn->tgt_port_length */ 5; memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); @@ -1532,11 +1582,6 @@ int spider_db_odbc::connect( } } my_afree(conn_str); - - net_tmo = conn->net_read_timeout > conn->net_write_timeout ? - conn->net_read_timeout : conn->net_write_timeout; - (void) SQLSetConnectAttr(hdbc, SQL_ATTR_CONNECTION_TIMEOUT, - (SQLPOINTER) (SQLULEN) net_tmo, SQL_IS_UINTEGER); DBUG_RETURN(0); error_connect: diff --git a/storage/spider/spd_db_odbc_mariadb.cc b/storage/spider/spd_db_odbc_mariadb.cc index 68720453c40..8d707c81b6d 100644 --- a/storage/spider/spd_db_odbc_mariadb.cc +++ b/storage/spider/spd_db_odbc_mariadb.cc @@ -52,13 +52,6 @@ #ifdef HAVE_SPIDER_ODBC -#define SPIDER_SQL_SERVER_STR "server" -#define SPIDER_SQL_SERVER_LEN (sizeof(SPIDER_SQL_SERVER_STR) - 1) -#define SPIDER_SQL_SOCKET_STR "socket" -#define SPIDER_SQL_SOCKET_LEN (sizeof(SPIDER_SQL_SOCKET_STR) - 1) -#define SPIDER_SQL_PORT_STR "port" -#define SPIDER_SQL_PORT_LEN (sizeof(SPIDER_SQL_PORT_STR) - 1) - #define SPIDER_SQL_CUR_CUR_STR "CURRENT OF " #define SPIDER_SQL_CUR_CUR_LEN (sizeof(SPIDER_SQL_CUR_CUR_STR) - 1) @@ -184,371 +177,6 @@ spider_db_odbc_mariadb::~spider_db_odbc_mariadb() DBUG_VOID_RETURN; } -int spider_db_odbc_mariadb::connect( - char *tgt_host, - char *tgt_username, - char *tgt_password, - long tgt_port, - char *tgt_socket, - char *server_name, - int connect_retry_count, - longlong connect_retry_interval -) { - SQLRETURN ret; - SQLUINTEGER login_tmo; - SQLUINTEGER net_tmo; - bool use_driver; - bool use_dir; - bool use_dsn; - bool use_db; - bool use_uid; - bool use_socket; - bool use_server; - bool use_port; - uint conn_str_len; - SQLSMALLINT dummy_len; - uchar *conn_str; - uchar *tmp_str; - DBUG_ENTER("spider_db_odbc_mariadb::connect"); - DBUG_PRINT("info",("spider this=%p", this)); -#ifndef DBUG_OFF - { - SQLCHAR server_name[80]; - SQLCHAR description[80]; - SQLSMALLINT srv_lgt; - SQLSMALLINT dsc_lgt; - ret = SQLDataSources(henv, SQL_FETCH_FIRST, - server_name, (SQLSMALLINT) 80, &srv_lgt, - description, (SQLSMALLINT) 80, &dsc_lgt); - while (ret == SQL_SUCCESS || ret == SQL_SUCCESS_WITH_INFO) - { - DBUG_PRINT("info",("spider server_name:%s description:%s", - server_name, description)); - ret = SQLDataSources(henv, SQL_FETCH_NEXT, - server_name, (SQLSMALLINT) 80, &srv_lgt, - description, (SQLSMALLINT) 80, &dsc_lgt); - } - } -#endif - - ret = SQLAllocHandle(SQL_HANDLE_DBC, henv, &hdbc); - if (ret != SQL_SUCCESS) - { - if (hdbc == SQL_NULL_HDBC) - { - DBUG_PRINT("info",("spider ret=%d", ret)); - if ((stored_error = spider_db_odbc_get_error(ret, SQL_HANDLE_ENV, henv, - conn, stored_error_msg))) - { - goto error_alloc_handle_dbc1; - } - } else { - DBUG_PRINT("info",("spider ret=%d", ret)); - if ((stored_error = spider_db_odbc_get_error(ret, SQL_HANDLE_DBC, hdbc, - conn, stored_error_msg))) - { - goto error_alloc_handle_dbc2; - } - } - } - - login_tmo = conn->connect_timeout; - ret = SQLSetConnectAttr(hdbc, SQL_LOGIN_TIMEOUT, - (SQLPOINTER) (SQLULEN) login_tmo, SQL_IS_UINTEGER); - if (ret != SQL_SUCCESS) - { - DBUG_PRINT("info",("spider ret=%d", ret)); - if ((stored_error = spider_db_odbc_get_error(ret, SQL_HANDLE_DBC, hdbc, - conn, stored_error_msg))) - { - goto error_set_timeout; - } - } - - net_tmo = conn->net_read_timeout > conn->net_write_timeout ? - conn->net_read_timeout : conn->net_write_timeout; - ret = SQLSetConnectAttr(hdbc, SQL_ATTR_CONNECTION_TIMEOUT, - (SQLPOINTER) (SQLULEN) net_tmo, SQL_IS_UINTEGER); - if (ret != SQL_SUCCESS) - { - DBUG_PRINT("info",("spider ret=%d", ret)); - if ((stored_error = spider_db_odbc_get_error(ret, SQL_HANDLE_DBC, hdbc, - conn, stored_error_msg))) - { - goto error_set_timeout; - } - } - - /* create connect string */ - use_driver = conn->tgt_default_group_length ? TRUE : FALSE; - DBUG_PRINT("info",("spider use_driver:%s", use_driver ? "TRUE" : "FALSE")); - use_dir = conn->tgt_default_file_length ? TRUE : FALSE; - DBUG_PRINT("info",("spider use_dir:%s", use_dir ? "TRUE" : "FALSE")); - use_dsn = conn->tgt_dsn_length ? TRUE : FALSE; - DBUG_PRINT("info",("spider use_dsn:%s", use_dsn ? "TRUE" : "FALSE")); - use_server = conn->tgt_host_length ? TRUE : FALSE; - DBUG_PRINT("info",("spider use_server:%s", use_server ? "TRUE" : "FALSE")); - use_socket = conn->tgt_socket_length ? TRUE : FALSE; - DBUG_PRINT("info",("spider use_socket:%s", use_socket ? "TRUE" : "FALSE")); - use_port = conn->tgt_port ? TRUE : FALSE; - DBUG_PRINT("info",("spider use_port:%s", use_port ? "TRUE" : "FALSE")); - use_db = conn->tgt_db_length ? TRUE : FALSE; - DBUG_PRINT("info",("spider use_db:%s", use_db ? "TRUE" : "FALSE")); - use_uid = conn->tgt_username_length ? TRUE : FALSE; - DBUG_PRINT("info",("spider use_uid:%s", use_uid ? "TRUE" : "FALSE")); - dummy_len = 0; - conn_str_len = - (use_driver ? - (SPIDER_DB_DRIVER_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + - SPIDER_SQL_OPEN_BRACE_LEN + conn->tgt_default_group_length * 2 + - SPIDER_SQL_CLOSE_BRACE_LEN + SPIDER_SQL_SEMICOLON_LEN + - (use_dir ? - (SPIDER_DB_DIRECTORY_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + - SPIDER_SQL_OPEN_BRACE_LEN + SPIDER_SQL_CLOSE_BRACE_LEN + - conn->tgt_default_file_length * 2 + SPIDER_SQL_SEMICOLON_LEN - ) : - 0) - ) : - 0) + - (use_dsn ? - (SPIDER_DB_DSN_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + - conn->tgt_dsn_length + SPIDER_SQL_SEMICOLON_LEN) : 0) + - (use_server ? - (SPIDER_SQL_SERVER_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + - SPIDER_SQL_OPEN_BRACE_LEN + SPIDER_SQL_CLOSE_BRACE_LEN + - conn->tgt_host_length * 2 + SPIDER_SQL_SEMICOLON_LEN) : 0) + - (use_socket ? - (SPIDER_SQL_SOCKET_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + - SPIDER_SQL_OPEN_BRACE_LEN + SPIDER_SQL_CLOSE_BRACE_LEN + - conn->tgt_socket_length * 2 + SPIDER_SQL_SEMICOLON_LEN) : 0) + - (use_port ? - (SPIDER_SQL_PORT_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + - /* conn->tgt_port_length */ 5 + SPIDER_SQL_SEMICOLON_LEN) : 0) + - (use_db ? - (SPIDER_SQL_DATABASE_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + - SPIDER_SQL_OPEN_BRACE_LEN + SPIDER_SQL_CLOSE_BRACE_LEN + - conn->tgt_db_length * 2 + SPIDER_SQL_SEMICOLON_LEN) : 0) + - (use_uid ? - (SPIDER_SQL_UID_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + - SPIDER_SQL_OPEN_BRACE_LEN + SPIDER_SQL_CLOSE_BRACE_LEN + - conn->tgt_username_length * 2 + SPIDER_SQL_SEMICOLON_LEN + - SPIDER_SQL_PWD_LEN + SPIDER_SQL_ODBC_EQUAL_LEN + - SPIDER_SQL_OPEN_BRACE_LEN + SPIDER_SQL_CLOSE_BRACE_LEN + - conn->tgt_password_length * 2 + SPIDER_SQL_SEMICOLON_LEN) : - 0) + - conn->tgt_ssl_ca_length + - conn->tgt_ssl_capath_length + - conn->tgt_ssl_cert_length + - conn->tgt_ssl_cipher_length + - conn->tgt_ssl_key_length; - conn_str = (uchar *) my_alloca(conn_str_len + 1); - if (!conn_str) - { - stored_error = HA_ERR_OUT_OF_MEM; - goto error_alloc_conn_str; - } - tmp_str = conn_str; - - /* additional connect parameter for ODBC */ - if (conn->tgt_ssl_ca_length) - { - memcpy(tmp_str, conn->tgt_ssl_ca, conn->tgt_ssl_ca_length); - tmp_str += conn->tgt_ssl_ca_length; - } - - if (use_driver) - { - memcpy(tmp_str, SPIDER_DB_DRIVER_STR, SPIDER_DB_DRIVER_LEN); - tmp_str += SPIDER_DB_DRIVER_LEN; - memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); - tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; - memcpy(tmp_str, SPIDER_SQL_OPEN_BRACE_STR, SPIDER_SQL_OPEN_BRACE_LEN); - tmp_str += SPIDER_SQL_OPEN_BRACE_LEN; - tmp_str = spider_duplicate_char( - tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), - (uchar *) conn->tgt_default_group, conn->tgt_default_group_length); - memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); - tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; - memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); - tmp_str += SPIDER_SQL_SEMICOLON_LEN; - if (use_dir) - { - memcpy(tmp_str, SPIDER_DB_DIRECTORY_STR, SPIDER_DB_DIRECTORY_LEN); - tmp_str += SPIDER_DB_DIRECTORY_LEN; - memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); - tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; - memcpy(tmp_str, SPIDER_SQL_OPEN_BRACE_STR, SPIDER_SQL_OPEN_BRACE_LEN); - tmp_str += SPIDER_SQL_OPEN_BRACE_LEN; - tmp_str = spider_duplicate_char( - tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), - (uchar *) conn->tgt_default_file, conn->tgt_default_file_length); - memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); - tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; - memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); - tmp_str += SPIDER_SQL_SEMICOLON_LEN; - } - } - - /* additional connect parameter for ODBC */ - if (conn->tgt_ssl_capath_length) - { - memcpy(tmp_str, conn->tgt_ssl_capath, conn->tgt_ssl_capath_length); - tmp_str += conn->tgt_ssl_capath_length; - } - - if (use_dsn) - { - memcpy(tmp_str, SPIDER_DB_DSN_STR, SPIDER_DB_DSN_LEN); - tmp_str += SPIDER_DB_DSN_LEN; - memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); - tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; - memcpy(tmp_str, conn->tgt_dsn, conn->tgt_dsn_length); - tmp_str += conn->tgt_dsn_length; - memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); - tmp_str += SPIDER_SQL_SEMICOLON_LEN; - } - - if (use_server) - { - memcpy(tmp_str, SPIDER_SQL_SERVER_STR, SPIDER_SQL_SERVER_LEN); - tmp_str += SPIDER_SQL_SERVER_LEN; - memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); - tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; - memcpy(tmp_str, SPIDER_SQL_OPEN_BRACE_STR, SPIDER_SQL_OPEN_BRACE_LEN); - tmp_str += SPIDER_SQL_OPEN_BRACE_LEN; - tmp_str = spider_duplicate_char( - tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), - (uchar *) conn->tgt_host, conn->tgt_host_length); - memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); - tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; - memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); - tmp_str += SPIDER_SQL_SEMICOLON_LEN; - } - - if (use_socket) - { - memcpy(tmp_str, SPIDER_SQL_SOCKET_STR, SPIDER_SQL_SOCKET_LEN); - tmp_str += SPIDER_SQL_SOCKET_LEN; - memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); - tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; - memcpy(tmp_str, SPIDER_SQL_OPEN_BRACE_STR, SPIDER_SQL_OPEN_BRACE_LEN); - tmp_str += SPIDER_SQL_OPEN_BRACE_LEN; - tmp_str = spider_duplicate_char( - tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), - (uchar *) conn->tgt_socket, conn->tgt_socket_length); - memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); - tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; - memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); - tmp_str += SPIDER_SQL_SEMICOLON_LEN; - } - - if (use_port) - { - memcpy(tmp_str, SPIDER_SQL_PORT_STR, SPIDER_SQL_PORT_LEN); - tmp_str += SPIDER_SQL_PORT_LEN; - memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); - tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; - my_sprintf((char *) tmp_str, ((char *) tmp_str, "%05ld", conn->tgt_port)); - tmp_str += /* conn->tgt_port_length */ 5; - memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); - tmp_str += SPIDER_SQL_SEMICOLON_LEN; - } - - /* additional connect parameter for ODBC */ - if (conn->tgt_ssl_cert_length) - { - memcpy(tmp_str, conn->tgt_ssl_cert, conn->tgt_ssl_cert_length); - tmp_str += conn->tgt_ssl_cert_length; - } - - if (use_db) - { - memcpy(tmp_str, SPIDER_SQL_DATABASE_STR, SPIDER_SQL_DATABASE_LEN); - tmp_str += SPIDER_SQL_DATABASE_LEN; - memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); - tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; - memcpy(tmp_str, SPIDER_SQL_OPEN_BRACE_STR, SPIDER_SQL_OPEN_BRACE_LEN); - tmp_str += SPIDER_SQL_OPEN_BRACE_LEN; - tmp_str = spider_duplicate_char( - tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), - (uchar *) conn->tgt_db, conn->tgt_db_length); - memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); - tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; - memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); - tmp_str += SPIDER_SQL_SEMICOLON_LEN; - } - - /* additional connect parameter for ODBC */ - if (conn->tgt_ssl_cipher_length) - { - memcpy(tmp_str, conn->tgt_ssl_cipher, conn->tgt_ssl_cipher_length); - tmp_str += conn->tgt_ssl_cipher_length; - } - - if (use_uid) - { - memcpy(tmp_str, SPIDER_SQL_UID_STR, SPIDER_SQL_UID_LEN); - tmp_str += SPIDER_SQL_UID_LEN; - memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); - tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; - memcpy(tmp_str, SPIDER_SQL_OPEN_BRACE_STR, SPIDER_SQL_OPEN_BRACE_LEN); - tmp_str += SPIDER_SQL_OPEN_BRACE_LEN; - tmp_str = spider_duplicate_char( - tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), - (uchar *) conn->tgt_username, conn->tgt_username_length); - memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); - tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; - memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); - tmp_str += SPIDER_SQL_SEMICOLON_LEN; - memcpy(tmp_str, SPIDER_SQL_PWD_STR, SPIDER_SQL_PWD_LEN); - tmp_str += SPIDER_SQL_PWD_LEN; - memcpy(tmp_str, SPIDER_SQL_ODBC_EQUAL_STR, SPIDER_SQL_ODBC_EQUAL_LEN); - tmp_str += SPIDER_SQL_ODBC_EQUAL_LEN; - memcpy(tmp_str, SPIDER_SQL_OPEN_BRACE_STR, SPIDER_SQL_OPEN_BRACE_LEN); - tmp_str += SPIDER_SQL_OPEN_BRACE_LEN; - tmp_str = spider_duplicate_char( - tmp_str, *((uchar *) SPIDER_SQL_CLOSE_BRACE_STR), - (uchar *) conn->tgt_password, conn->tgt_password_length); - memcpy(tmp_str, SPIDER_SQL_CLOSE_BRACE_STR, SPIDER_SQL_CLOSE_BRACE_LEN); - tmp_str += SPIDER_SQL_CLOSE_BRACE_LEN; - memcpy(tmp_str, SPIDER_SQL_SEMICOLON_STR, SPIDER_SQL_SEMICOLON_LEN); - tmp_str += SPIDER_SQL_SEMICOLON_LEN; - } - - /* additional connect parameter for ODBC */ - if (conn->tgt_ssl_key_length) - { - memcpy(tmp_str, conn->tgt_ssl_key, conn->tgt_ssl_key_length); - tmp_str += conn->tgt_ssl_key_length; - } - *tmp_str = '\0'; - - DBUG_PRINT("info",("spider conn_str=%s", conn_str)); - DBUG_PRINT("info",("spider conn_str_len=%u", conn_str_len)); - ret = SQLDriverConnect(hdbc, SQL_NULL_HANDLE, (SQLCHAR *) conn_str, - (SQLSMALLINT) conn_str_len, (SQLCHAR *) NULL, dummy_len, &dummy_len, - SQL_DRIVER_NOPROMPT); - if (ret != SQL_SUCCESS) - { - DBUG_PRINT("info",("spider ret=%d", ret)); - if ((stored_error = spider_db_odbc_get_error(ret, SQL_HANDLE_DBC, hdbc, - conn, stored_error_msg))) - { - goto error_connect; - } - } - my_afree(conn_str); - DBUG_RETURN(0); - -error_connect: - my_afree(conn_str); -error_alloc_conn_str: -error_set_timeout: -error_alloc_handle_dbc2: -error_alloc_handle_dbc1: - DBUG_RETURN(stored_error); -} - void spider_db_odbc_mariadb::disconnect() { SQLRETURN ret; diff --git a/storage/spider/spd_db_odbc_mariadb.h b/storage/spider/spd_db_odbc_mariadb.h index c02108be891..f093b981f30 100644 --- a/storage/spider/spd_db_odbc_mariadb.h +++ b/storage/spider/spd_db_odbc_mariadb.h @@ -66,16 +66,6 @@ public: SPIDER_CONN *conn ); virtual ~spider_db_odbc_mariadb(); - virtual int connect( - char *tgt_host, - char *tgt_username, - char *tgt_password, - long tgt_port, - char *tgt_socket, - char *server_name, - int connect_retry_count, - longlong connect_retry_interval - ); virtual void disconnect(); virtual int exec_query( const char *query, diff --git a/storage/spider/spider_odbc.md b/storage/spider/spider_odbc.md index 7c0116ba078..00437801cda 100644 --- a/storage/spider/spider_odbc.md +++ b/storage/spider/spider_odbc.md @@ -104,40 +104,27 @@ PARTITION BY KEY(c1) ( ### Parameters for ODBC connections --- The following parameters are available for ODBC connections. -- Common - - default_group: ODBC driver name - - default_file: ODBC directory name (default_group is required for using this parameter) - - dsn: ODBC DSN - - database: ODBC database - - user: ODBC UID - - password: ODBC PWD (user is required for using this parameter) -- odbc_mariadb only - - host: ODBC server - - port: ODBC port - - socket: socket file name -- odbc only - - host: ODBC server (database is required for using this parameter) - - port: ODBC port (database is required for using this parameter) +- filedsn: ODBC dsn file name +- dsn: ODBC DSN +- driver: ODBC driver name +- host: ODBC server +- socket: socket file name +- port: ODBC port +- database: ODBC database +- user: ODBC UID +- password: ODBC PWD (user is required for using this parameter) Additionally, ssl_ca, ssl_capath, ssl_cert, ssl_cipher, ssl_key can be used for adding specific parameters of ODBC drivers. -- odbc_mariadb: - - ssl_ca is added on top of ODBC connection parameters. - - ssl_capath is added between ODBC DRIVER and DSN. - - ssl_cert is added between ODBC PORT and DATABASE. - - ssl_cipher is added between ODBC DATABASE and UID. - - ssl_key is added on bottom of ODBC connection parameters. -- odbc: - - ssl_ca is added on top of ODBC connection parameters. - - ssl_capath is added between ODBC DRIVER and DSN. - - ssl_cert is added between ODBC DSN and DATABASE. - - ssl_cipher is added between ODBC DATABASE and UID. - - ssl_key is added on bottom of ODBC connection parameters. +- ssl_ca is added on top of ODBC connection parameters. +- ssl_capath is added between DSN and ODBC DRIVER. +- ssl_cert is added between ODBC PORT and DATABASE. +- ssl_cipher is added between ODBC DATABASE and UID. +- ssl_key is added on bottom of ODBC connection parameters. ### Difference between odbc_mariadb and odbc --- There are some internal differences. - odbc_mariadb: - - "DATABASE=database;SERVER=host;PORT=port;" in connection string. - The name quote is back quote. - The modes of lock table are "read local", "read", "low_priority write", and "write". - Lock table command causes a commit of transaction. @@ -146,7 +133,6 @@ There are some internal differences. - The shared lock word with SELECT is "lock in shared mode". - The name of cursors have to change for each thread. - odbc: - - "DATABASE=database:host:port;" in connection string. - The name quote is double quote. - The modes of lock table are "in share mode", and "in exclusive mode". - Lock table command has to inside of transaction. |