skip all tests with LOAD DATA in case of tests via Maxscale

2025-07-29 08:21:15 +03:00 · 2024-08-08 01:52:30 +03:00
parent 3ed2a7e298
commit 664bb924c4
78 changed files with 869 additions and 27 deletions
--- a/mysql-test/columnstore/basic/t/mcol641-insert.test
+++ b/mysql-test/columnstore/basic/t/mcol641-insert.test
@ -1,4 +1,5 @@
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcol641_insert_db;
--- a/mysql-test/columnstore/basic/t/mcs102_ldi_transform_csv.test
+++ b/mysql-test/columnstore/basic/t/mcs102_ldi_transform_csv.test
@ -3,6 +3,7 @@
 # Author: Susil, susil.behera@mariadb.com  #  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 let $DATADIR= `SELECT @@datadir`;

--- a/mysql-test/columnstore/basic/t/mcs103_ldi_fields_enclosed_by.test
+++ b/mysql-test/columnstore/basic/t/mcs103_ldi_fields_enclosed_by.test
@ -3,6 +3,7 @@
 # Author: Susil, susil.behera@mariadb.com  #  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 let $DATADIR= `SELECT @@datadir`;

--- a/mysql-test/columnstore/basic/t/mcs104_ldi_fields_escaped_by.test
+++ b/mysql-test/columnstore/basic/t/mcs104_ldi_fields_escaped_by.test
@ -3,6 +3,7 @@
 # Author: Susil, susil.behera@mariadb.com  #  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 let $DATADIR= `SELECT @@datadir`;

--- a/mysql-test/columnstore/basic/t/mcs105_ldi_lines_terminated_by.test
+++ b/mysql-test/columnstore/basic/t/mcs105_ldi_lines_terminated_by.test
@ -3,6 +3,7 @@
 # Author: Susil, susil.behera@mariadb.com     #  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 let $DATADIR= `SELECT @@datadir`;

--- a/mysql-test/columnstore/basic/t/mcs106_ldi_ignore_rows.test
+++ b/mysql-test/columnstore/basic/t/mcs106_ldi_ignore_rows.test
@ -3,6 +3,7 @@
 # Author: Susil, susil.behera@mariadb.com     #  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 let $DATADIR= `SELECT @@datadir`;

--- a/mysql-test/columnstore/basic/t/mcs10_drop_db_table.test
+++ b/mysql-test/columnstore/basic/t/mcs10_drop_db_table.test
@ -3,6 +3,8 @@
 #
 -- source ../include/have_columnstore.inc
 -- source include/have_innodb.inc
+-- source ../include/check_maxscale.inc
+

 --disable_warnings
 DROP DATABASE IF EXISTS mcs10_db1;
@ -68,8 +70,18 @@ DROP TABLE IF EXISTS mcs10_db2.t_columnstore1;
 USE mcs10_db1;
 CREATE TABLE t_columnstore1 (id int) engine=columnstore;
 CREATE TABLE t_columnstore2 (id int) engine=columnstore;
-connect (addconroot1, localhost, root,,);
-connect (addconroot2, localhost, root,,);
+--disable_query_log
+if ($maxscale == 1)
+{
+  connect(addconroot1, 127.0.0.1, testUser, 'ct570c3521fCCR#ef',,4006);
+  connect(addconroot2, 127.0.0.1, testUser, 'ct570c3521fCCR#ef',,4006);
+}
+if ($maxscale == 0)
+{
+  connect (addconroot1, localhost, root,,);
+  connect (addconroot2, localhost, root,,);
+}
+--enable_query_log
 connection addconroot1;
 DROP TABLE mcs10_db1.t_columnstore1;
 connection addconroot2;
--- a/mysql-test/columnstore/basic/t/mcs117_create_utf8.test
+++ b/mysql-test/columnstore/basic/t/mcs117_create_utf8.test
@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+-- source ../include/detect_maxscale.inc

 set names utf8;

--- a/mysql-test/columnstore/basic/t/mcs117_create_utf8_maxscale.test
+++ b/mysql-test/columnstore/basic/t/mcs117_create_utf8_maxscale.test
@ -0,0 +1,44 @@
+#
+# Test UTF8 names
+# Author: Bharath, bharath.bokka@mariadb.com
+#
+-- source ../include/have_columnstore.inc
+-- source ../include/detect_no_maxscale.inc
+
+set names utf8;
+
+--disable_warnings
+DROP DATABASE IF EXISTS mcs117_db;
+--enable_warnings
+
+CREATE DATABASE имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+USE имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+SELECT DATABASE();
+
+CREATE DATABASE mcs117_db;
+USE mcs117_db;
+
+SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.schemata
+WHERE schema_name='имя_базы_в_кодировке_утф8_длиной_больше_чем_45';
+
+DROP DATABASE имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+
+CREATE TABLE имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48
+(
+  имя_поля_в_кодировке_утф8_длиной_больше_чем_45 INT
+)ENGINE=Columnstore;
+
+--replace_regex /( COLLATE=latin1_swedish_ci)//
+SHOW CREATE TABLE имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
+
+CREATE VIEW имя_вью_кодировке_утф8_длиной_больше_чем_42 AS SELECT * FROM имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
+SHOW CREATE VIEW  имя_вью_кодировке_утф8_длиной_больше_чем_42;
+
+select TABLE_NAME from information_schema.tables where table_schema='mcs117_db' order by 1;
+
+select COLUMN_NAME from information_schema.columns where table_schema='mcs117_db' order by 1;
+
+select TABLE_NAME from information_schema.views where table_schema='mcs117_db' order by 1;
+
+# Clean UP
+DROP DATABASE mcs117_db;
--- a/mysql-test/columnstore/basic/t/mcs11_show_db_table.test
+++ b/mysql-test/columnstore/basic/t/mcs11_show_db_table.test
@ -3,6 +3,8 @@
 #
 -- source ../include/have_columnstore.inc
 -- source include/have_innodb.inc
+-- source ../include/check_maxscale.inc
+

 --disable_warnings
 DROP DATABASE IF EXISTS mcs11_db1;
@ -41,8 +43,18 @@ SHOW TABLES;
 SHOW TABLES IN mcs11_db2;

 # Test from parallel connections
-connect (addconroot1, localhost, root,,);
-connect (addconroot2, localhost, root,,);
+--disable_query_log
+if ($maxscale == 1)
+{
+  connect(addconroot1, 127.0.0.1, testUser, 'ct570c3521fCCR#ef',,4006);
+  connect(addconroot2, 127.0.0.1, testUser, 'ct570c3521fCCR#ef',,4006);
+}
+if ($maxscale == 0)
+{
+  connect (addconroot1, localhost, root,,);
+  connect (addconroot2, localhost, root,,);
+}
+--enable_query_log
 connection addconroot1;
 --sorted_result
 SHOW DATABASES LIKE 'mcs11%';
--- a/mysql-test/columnstore/basic/t/mcs12_alter_table.test
+++ b/mysql-test/columnstore/basic/t/mcs12_alter_table.test
@ -3,6 +3,8 @@
 #
 -- source ../include/have_columnstore.inc
 -- source include/have_innodb.inc
+-- source ../include/check_maxscale.inc
+

 --disable_warnings
 DROP DATABASE IF EXISTS mcs12_db1;
@ -67,8 +69,18 @@ DROP TABLE t1;
 CREATE TABLE t1 (i INTEGER) ENGINE=Columnstore;

 # Test from parallel connections
-connect (addconroot1, localhost, root,,);
-connect (addconroot2, localhost, root,,);
+--disable_query_log
+if ($maxscale == 1)
+{
+  connect(addconroot1, 127.0.0.1, testUser, 'ct570c3521fCCR#ef',,4006);
+  connect(addconroot2, 127.0.0.1, testUser, 'ct570c3521fCCR#ef',,4006);
+}
+if ($maxscale == 0)
+{
+  connect (addconroot1, localhost, root,,);
+  connect (addconroot2, localhost, root,,);
+}
+--enable_query_log
 connection addconroot1;
 --replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE mcs12_db1.t1;
--- a/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test
+++ b/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test
@ -2,6 +2,8 @@
 # Test ALTER TABLE schemas in various negative scenarios.
 #
 -- source ../include/have_columnstore.inc
+-- source ../include/check_maxscale.inc
+

 --disable_warnings
 DROP DATABASE IF EXISTS mcs13_db1;
@ -54,8 +56,18 @@ ALTER TABLE t1 ADD PRIMARY KEY pk(c1);
 ALTER TABLE t1 DROP KEY k1;

 # Test from parallel connections
-connect (addconroot1, localhost, root,,);
-connect (addconroot2, localhost, root,,);
+--disable_query_log
+if ($maxscale == 1)
+{
+  connect(addconroot1, 127.0.0.1, testUser, 'ct570c3521fCCR#ef',,4006);
+  connect(addconroot2, 127.0.0.1, testUser, 'ct570c3521fCCR#ef',,4006);
+}
+if ($maxscale == 0)
+{
+  connect (addconroot1, localhost, root,,);
+  connect (addconroot2, localhost, root,,);
+}
+--enable_query_log
 connection addconroot1;
 --error 4161
 ALTER TABLE mcs13_db1.t1 CHANGE c1 c2 INVALIDDATATYPE;
--- a/mysql-test/columnstore/basic/t/mcs14_truncate_table.test
+++ b/mysql-test/columnstore/basic/t/mcs14_truncate_table.test
@ -3,6 +3,8 @@
 #
 -- source ../include/have_columnstore.inc
 -- source include/have_innodb.inc
+-- source ../include/check_maxscale.inc
+

 --disable_warnings
 DROP DATABASE IF EXISTS mcs14_db1;
@ -68,8 +70,18 @@ CREATE TABLE t2 LIKE t1;
 INSERT INTO t2 SELECT * FROM t1;

 # Test from parallel connections
-connect (addconroot1, localhost, root,,);
-connect (addconroot2, localhost, root,,);
+--disable_query_log
+if ($maxscale == 1)
+{
+  connect(addconroot1, 127.0.0.1, testUser, 'ct570c3521fCCR#ef',,4006);
+  connect(addconroot2, 127.0.0.1, testUser, 'ct570c3521fCCR#ef',,4006);
+}
+if ($maxscale == 0)
+{
+  connect (addconroot1, localhost, root,,);
+  connect (addconroot2, localhost, root,,);
+}
+--enable_query_log
 connection addconroot1;
 TRUNCATE mcs14_db1.t1;
 connection addconroot2;
--- a/mysql-test/columnstore/basic/t/mcs170_session_functions.test
+++ b/mysql-test/columnstore/basic/t/mcs170_session_functions.test
@ -3,6 +3,8 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
+

 SET default_storage_engine=Columnstore;

--- a/mysql-test/columnstore/basic/t/mcs170_session_functions_maxscale.test
+++ b/mysql-test/columnstore/basic/t/mcs170_session_functions_maxscale.test
@ -0,0 +1,26 @@
+#
+# Test Session functions
+# Author: Bharath, bharath.bokka@mariadb.com
+#
+-- source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+
+
+SET default_storage_engine=Columnstore;
+
+--disable_warnings
+DROP DATABASE IF EXISTS mcs170_db;
+--enable_warnings
+
+CREATE DATABASE mcs170_db;
+USE mcs170_db;
+
+SELECT CONNECTION_ID() > 0;
+SELECT CURRENT_USER();
+SELECT USER();
+SELECT SESSION_USER();
+SELECT SYSTEM_USER();
+SELECT DATABASE();
+
+# Clean UP
+DROP DATABASE mcs170_db;
--- a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
+++ b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
@ -4,6 +4,8 @@
 #
 -- source ../include/have_columnstore.inc
 -- source include/have_innodb.inc
+-- source ../include/check_maxscale.inc
+

 SET default_storage_engine=InnoDB;

@ -29,10 +31,17 @@ GRANT CREATE, SELECT, INSERT ON mcs19_db.* TO 'user1'@'localhost';

 --disable_query_log
 GRANT ALL ON test.* TO 'user1'@'localhost';
+if ($maxscale == 1)
+{
+  connect(conn1, 127.0.0.1, user1, Vagrant1|0000001,,4006);
+  connect(conn2, 127.0.0.1, user1, Vagrant1|0000001,,4006);
+}
+if ($maxscale == 0)
+{
+  connect(conn1, localhost, user1, Vagrant1|0000001,);
+  connect(conn2, localhost, user1, Vagrant1|0000001,);
+}
 --enable_query_log
-connect(conn1, localhost, user1, Vagrant1|0000001,);
-connect(conn2, localhost, user1, Vagrant1|0000001,);
-
 connection conn1;
 SELECT USER();
 SHOW GRANTS FOR 'user1'@'localhost';
--- a/mysql-test/columnstore/basic/t/mcs211_idbExtentId_function.test
+++ b/mysql-test/columnstore/basic/t/mcs211_idbExtentId_function.test
@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs211_db;
--- a/mysql-test/columnstore/basic/t/mcs212_idbExtentMax_function.test
+++ b/mysql-test/columnstore/basic/t/mcs212_idbExtentMax_function.test
@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs212_db;
--- a/mysql-test/columnstore/basic/t/mcs213_idbExtentMin_function.test
+++ b/mysql-test/columnstore/basic/t/mcs213_idbExtentMin_function.test
@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs213_db;
--- a/mysql-test/columnstore/basic/t/mcs216_idbSegmentDir_function.test
+++ b/mysql-test/columnstore/basic/t/mcs216_idbSegmentDir_function.test
@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs216_db;
--- a/mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test
+++ b/mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test
@ -3,6 +3,7 @@
 # Author: Susil, susil.behera@mariadb.com  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs28_db1;
--- a/mysql-test/columnstore/basic/t/mcs29_load_data_local_infile_negative.test
+++ b/mysql-test/columnstore/basic/t/mcs29_load_data_local_infile_negative.test
@ -3,6 +3,7 @@
 # Author: Susil, susil.behera@mariadb.com  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs29_db1;
--- a/mysql-test/columnstore/basic/t/mcs47_cpimport_central_loc_sin_source.test
+++ b/mysql-test/columnstore/basic/t/mcs47_cpimport_central_loc_sin_source.test
@ -8,6 +8,7 @@ if (!$MYSQL_TEST_ROOT){
 }

 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs47_db;
--- a/mysql-test/columnstore/basic/t/mcs50_cpimport_stdin.test
+++ b/mysql-test/columnstore/basic/t/mcs50_cpimport_stdin.test
@ -8,6 +8,7 @@ if (!$MYSQL_TEST_ROOT){
 }

 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs50_db;
--- a/mysql-test/columnstore/basic/t/mcs51_cpimport_select_from.test
+++ b/mysql-test/columnstore/basic/t/mcs51_cpimport_select_from.test
@ -8,6 +8,7 @@ if (!$MYSQL_TEST_ROOT){
 }

 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 -- source include/have_innodb.inc

 --disable_warnings
--- a/mysql-test/columnstore/basic/t/mcs55_cpimport_binary_source.test
+++ b/mysql-test/columnstore/basic/t/mcs55_cpimport_binary_source.test
@ -8,6 +8,7 @@ if (!$MYSQL_TEST_ROOT){
 }

 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs55_db;
--- a/mysql-test/columnstore/basic/t/mcs67_ldi_datafile_separators.test
+++ b/mysql-test/columnstore/basic/t/mcs67_ldi_datafile_separators.test
@ -3,6 +3,7 @@
 # Author: Susil, susil.behera@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs67_db;
--- a/mysql-test/columnstore/basic/t/mcs68_cpimport_datafile_separators.test
+++ b/mysql-test/columnstore/basic/t/mcs68_cpimport_datafile_separators.test
@ -8,6 +8,7 @@ if (!$MYSQL_TEST_ROOT){
 }

 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs68_db;
--- a/mysql-test/columnstore/basic/t/mcs88_import_export_csv.test
+++ b/mysql-test/columnstore/basic/t/mcs88_import_export_csv.test
@ -3,6 +3,7 @@
 # Author: Susil, susil.behera@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 let $DATADIR= `SELECT @@datadir`;

--- a/mysql-test/columnstore/basic/t/std_aggregate_columnstore.test
+++ b/mysql-test/columnstore/basic/t/std_aggregate_columnstore.test
@ -1,4 +1,5 @@
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS std_test_db;
--- a/mysql-test/columnstore/basic/t/std_aggregate_window_columnstore.test
+++ b/mysql-test/columnstore/basic/t/std_aggregate_window_columnstore.test
@ -1,4 +1,5 @@
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS std_test_db;
--- a/mysql-test/columnstore/basic/t/unsigned_aggregate.test
+++ b/mysql-test/columnstore/basic/t/unsigned_aggregate.test
@ -1,4 +1,5 @@
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS unsigned_aggregate_db;
--- a/mysql-test/columnstore/basic/t/unsigned_joins.test
+++ b/mysql-test/columnstore/basic/t/unsigned_joins.test
@ -1,4 +1,5 @@
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS unsigned_joins_db;