mariadb-corporation · timofeyturenko · Aug 7, 2024 · Aug 20, 2024
diff --git a/mysql-test/columnstore/1pmonly/t/mcol4652-cpimport-sets-wide-decimals-ranges.test b/mysql-test/columnstore/1pmonly/t/mcol4652-cpimport-sets-wide-decimals-ranges.test
@@ -1,4 +1,5 @@
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcol4652;

diff --git a/mysql-test/columnstore/1pmonly/t/mcs201_calshowpartitions_function.test b/mysql-test/columnstore/1pmonly/t/mcs201_calshowpartitions_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, [email protected]
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs201_db;

diff --git a/mysql-test/columnstore/1pmonly/t/mcs202_caldisablepartitions_function.test b/mysql-test/columnstore/1pmonly/t/mcs202_caldisablepartitions_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, [email protected]
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs202_db;

diff --git a/mysql-test/columnstore/1pmonly/t/mcs203_calenablepartitions_function.test b/mysql-test/columnstore/1pmonly/t/mcs203_calenablepartitions_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, [email protected]
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs203_db;

diff --git a/mysql-test/columnstore/1pmonly/t/mcs204_caldroppartitions_function.test b/mysql-test/columnstore/1pmonly/t/mcs204_caldroppartitions_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, [email protected]
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs204_db;

diff --git a/mysql-test/columnstore/1pmonly/t/mcs208_idbPartition_function.test b/mysql-test/columnstore/1pmonly/t/mcs208_idbPartition_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, [email protected]
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs208_db;

diff --git a/mysql-test/columnstore/1pmonly/t/mcs209_idbDBRoot_function.test b/mysql-test/columnstore/1pmonly/t/mcs209_idbDBRoot_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, [email protected]
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs209_db;

diff --git a/mysql-test/columnstore/1pmonly/t/mcs210_idbPm_function.test b/mysql-test/columnstore/1pmonly/t/mcs210_idbPm_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, [email protected]
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs210_db;

diff --git a/mysql-test/columnstore/1pmonly/t/mcs214_idbExtentRelativeRid_function.test b/mysql-test/columnstore/1pmonly/t/mcs214_idbExtentRelativeRid_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, [email protected]
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs214_db;

diff --git a/mysql-test/columnstore/1pmonly/t/mcs215_idbSegment_function.test b/mysql-test/columnstore/1pmonly/t/mcs215_idbSegment_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, [email protected]
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs215_db;

diff --git a/mysql-test/columnstore/1pmonly/t/mcs4009_autopilot_partition_management.test b/mysql-test/columnstore/1pmonly/t/mcs4009_autopilot_partition_management.test
@@ -4,6 +4,7 @@
 # Author: Daniel Lee, [email protected]
 # -------------------------------------------------------------- #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4009_db;

diff --git a/mysql-test/columnstore/1pmonly/t/mcs7000_version_buffer.test b/mysql-test/columnstore/1pmonly/t/mcs7000_version_buffer.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs7000_db;

diff --git a/mysql-test/columnstore/autopilot/t/mcs4004_autopilot_batchInsert_ldi.test b/mysql-test/columnstore/autopilot/t/mcs4004_autopilot_batchInsert_ldi.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4004_db;

diff --git a/mysql-test/columnstore/autopilot/t/mcs4005_autopilot_add_drop_columns.test b/mysql-test/columnstore/autopilot/t/mcs4005_autopilot_add_drop_columns.test
@@ -4,6 +4,7 @@
 # Author: Daniel Lee, [email protected]
 # -------------------------------------------------------------- #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4005_db;

diff --git a/mysql-test/columnstore/autopilot/t/mcs4006_autopilot_create_dbt3_database_1m.test b/mysql-test/columnstore/autopilot/t/mcs4006_autopilot_create_dbt3_database_1m.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4006_db;

diff --git a/mysql-test/columnstore/autopilot/t/mcs4007_autopilot_dbt3_performance_queries_1g.test b/mysql-test/columnstore/autopilot/t/mcs4007_autopilot_dbt3_performance_queries_1g.test
@@ -8,6 +8,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4007_db;

diff --git a/mysql-test/columnstore/autopilot/t/mcs4008_autopilot_sanity_test.test b/mysql-test/columnstore/autopilot/t/mcs4008_autopilot_sanity_test.test
@@ -4,6 +4,7 @@
 # Author: Daniel Lee, [email protected]
 # -------------------------------------------------------------- #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4008_db;

diff --git a/mysql-test/columnstore/autopilot/t/mcs4010_autopilot_cross_engine_join.test b/mysql-test/columnstore/autopilot/t/mcs4010_autopilot_cross_engine_join.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4010_db;

diff --git a/mysql-test/columnstore/autopilot/t/mcs4011_autopilot_query_stats.test b/mysql-test/columnstore/autopilot/t/mcs4011_autopilot_query_stats.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4011_db;

diff --git a/mysql-test/columnstore/basic/r/mcs10_drop_db_table.result b/mysql-test/columnstore/basic/r/mcs10_drop_db_table.result
@@ -62,8 +62,6 @@ 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,,;
 connection addconroot1;
 DROP TABLE mcs10_db1.t_columnstore1;
 connection addconroot2;

diff --git a/mysql-test/columnstore/basic/r/mcs117_create_utf8_maxscale.result b/mysql-test/columnstore/basic/r/mcs117_create_utf8_maxscale.result
@@ -0,0 +1,39 @@
+set names utf8;
+DROP DATABASE IF EXISTS mcs117_db;
+CREATE DATABASE имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+USE имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+SELECT DATABASE();
+DATABASE()
+имя_базы_в_кодировке_утф8_длиной_больше_чем_45
+CREATE DATABASE mcs117_db;
+USE mcs117_db;
+SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.schemata
+WHERE schema_name='имя_базы_в_кодировке_утф8_длиной_больше_чем_45';
+SCHEMA_NAME
+имя_базы_в_кодировке_утф8_длиной_больше_чем_45
+DROP DATABASE имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+CREATE TABLE имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48
+(
+имя_поля_в_кодировке_утф8_длиной_больше_чем_45 INT
+)ENGINE=Columnstore;
+SHOW CREATE TABLE имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
+Table	Create Table
+имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48	CREATE TABLE `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48` (
+  `имя_поля_в_кодировке_утф8_длиной_больше_чем_45` int(11) DEFAULT NULL
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+CREATE VIEW имя_вью_кодировке_утф8_длиной_больше_чем_42 AS SELECT * FROM имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
+SHOW CREATE VIEW  имя_вью_кодировке_утф8_длиной_больше_чем_42;
+View	Create View	character_set_client	collation_connection
+имя_вью_кодировке_утф8_длиной_больше_чем_42	CREATE ALGORITHM=UNDEFINED DEFINER=`testUser`@`%` SQL SECURITY DEFINER VIEW `имя_вью_кодировке_утф8_длиной_больше_чем_42` AS select `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`.`имя_поля_в_кодировке_утф8_длиной_больше_чем_45` AS `имя_поля_в_кодировке_утф8_длиной_больше_чем_45` from `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`	utf8mb3	utf8mb3_general_ci
+select TABLE_NAME from information_schema.tables where table_schema='mcs117_db' order by 1;
+TABLE_NAME
+имя_вью_кодировке_утф8_длиной_больше_чем_42
+имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48
+select COLUMN_NAME from information_schema.columns where table_schema='mcs117_db' order by 1;
+COLUMN_NAME
+имя_поля_в_кодировке_утф8_длиной_больше_чем_45
+имя_поля_в_кодировке_утф8_длиной_больше_чем_45
+select TABLE_NAME from information_schema.views where table_schema='mcs117_db' order by 1;
+TABLE_NAME
+имя_вью_кодировке_утф8_длиной_больше_чем_42
+DROP DATABASE mcs117_db;
diff --git a/mysql-test/columnstore/basic/r/mcs11_show_db_table.result b/mysql-test/columnstore/basic/r/mcs11_show_db_table.result
@@ -40,8 +40,6 @@ SHOW TABLES IN mcs11_db2;
 Tables_in_mcs11_db2
 t1
 t2
-connect  addconroot1, localhost, root,,;
-connect  addconroot2, localhost, root,,;
 connection addconroot1;
 SHOW DATABASES LIKE 'mcs11%';
 Database (mcs11%)

diff --git a/mysql-test/columnstore/basic/r/mcs12_alter_table.result b/mysql-test/columnstore/basic/r/mcs12_alter_table.result
@@ -114,8 +114,6 @@ new_i	c	i2
 2	b	22
 DROP TABLE t1;
 CREATE TABLE t1 (i INTEGER) ENGINE=Columnstore;
-connect  addconroot1, localhost, root,,;
-connect  addconroot2, localhost, root,,;
 connection addconroot1;
 SHOW CREATE TABLE mcs12_db1.t1;
 Table	Create Table

diff --git a/mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result b/mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result
@@ -38,8 +38,6 @@ ALTER TABLE t1 ADD PRIMARY KEY pk(c1);
 ERROR 42000: Too many keys specified; max 0 keys allowed
 ALTER TABLE t1 DROP KEY k1;
 ERROR 42000: Can't DROP INDEX `k1`; check that it exists
-connect  addconroot1, localhost, root,,;
-connect  addconroot2, localhost, root,,;
 connection addconroot1;
 ALTER TABLE mcs13_db1.t1 CHANGE c1 c2 INVALIDDATATYPE;
 ERROR HY000: Unknown data type: 'INVALIDDATATYPE'

diff --git a/mysql-test/columnstore/basic/r/mcs14_truncate_table.result b/mysql-test/columnstore/basic/r/mcs14_truncate_table.result
@@ -65,8 +65,6 @@ CREATE TABLE t1 (id INT) ENGINE=Columnstore;
 INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5);
 CREATE TABLE t2 LIKE t1;
 INSERT INTO t2 SELECT * FROM t1;
-connect  addconroot1, localhost, root,,;
-connect  addconroot2, localhost, root,,;
 connection addconroot1;
 TRUNCATE mcs14_db1.t1;
 connection addconroot2;

diff --git a/mysql-test/columnstore/basic/r/mcs170_session_functions_maxscale.result b/mysql-test/columnstore/basic/r/mcs170_session_functions_maxscale.result
@@ -0,0 +1,23 @@
+SET default_storage_engine=Columnstore;
+DROP DATABASE IF EXISTS mcs170_db;
+CREATE DATABASE mcs170_db;
+USE mcs170_db;
+SELECT CONNECTION_ID() > 0;
+CONNECTION_ID() > 0
+1
+SELECT CURRENT_USER();
+CURRENT_USER()
+testUser@%
+SELECT USER();
+USER()
+testUser@max
+SELECT SESSION_USER();
+SESSION_USER()
+testUser@max
+SELECT SYSTEM_USER();
+SYSTEM_USER()
+testUser@max
+SELECT DATABASE();
+DATABASE()
+mcs170_db
+DROP DATABASE mcs170_db;
diff --git a/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result b/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result
@@ -23,8 +23,6 @@ SHOW GRANTS FOR 'user1'@'localhost';
 Grants for user1@localhost
 GRANT USAGE ON *.* TO `user1`@`localhost` IDENTIFIED BY PASSWORD '*CB386B3062EFB295ED40F6A5B1A8CFE300642E38'
 GRANT CREATE, SELECT, INSERT ON mcs19_db.* TO 'user1'@'localhost';
-connect conn1, localhost, user1, Vagrant1|0000001,;
-connect conn2, localhost, user1, Vagrant1|0000001,;
 connection conn1;
 SELECT USER();
 USER()

diff --git a/mysql-test/columnstore/basic/t/mcol-5505-cpimport-parquet-large-volume.test b/mysql-test/columnstore/basic/t/mcol-5505-cpimport-parquet-large-volume.test
@@ -7,6 +7,7 @@ if (!$MYSQL_TEST_ROOT){
 }
 
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcol_5505_parquet_large_volume;
@@ -79,4 +80,4 @@ SELECT COUNT(*) FROM t4;
 --exec rm $MTR_SUITE_DIR/../std_data/10MRows.parquet
 --exec rm $MTR_SUITE_DIR/../std_data/50MRows.parquet
 --exec rm $MTR_SUITE_DIR/../std_data/100MRows.parquet
-DROP DATABASE mcol_5505_parquet_large_volume;
+DROP DATABASE mcol_5505_parquet_large_volume;
diff --git a/mysql-test/columnstore/basic/t/mcol-5505-cpimport-parquet.test b/mysql-test/columnstore/basic/t/mcol-5505-cpimport-parquet.test
@@ -7,6 +7,7 @@ if (!$MYSQL_TEST_ROOT){
 }
 
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcol_5505_cpimport_parquet;
@@ -61,4 +62,4 @@ SELECT COUNT(*) FROM t1;
 # Clean UP
 --exec rm $MTR_SUITE_DIR/../std_data/tests.parquet
 --exec rm $MTR_SUITE_DIR/../std_data/nulls.parquet
-DROP DATABASE mcol_5505_cpimport_parquet;
+DROP DATABASE mcol_5505_cpimport_parquet;
diff --git 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;

diff --git 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, [email protected]  #  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 let $DATADIR= `SELECT @@datadir`;
 

diff --git 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, [email protected]  #  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 let $DATADIR= `SELECT @@datadir`;
 

diff --git 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, [email protected]  #  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 let $DATADIR= `SELECT @@datadir`;
 

diff --git 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, [email protected]     #  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 let $DATADIR= `SELECT @@datadir`;
 

diff --git 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, [email protected]     #  
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 
 let $DATADIR= `SELECT @@datadir`;
 

diff --git 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;

diff --git 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, [email protected]
 #
 -- source ../include/have_columnstore.inc
+-- source ../include/detect_maxscale.inc
 
 set names utf8;