dlee mtr 23.08.1 (#2932)

* Added order by clause to keep results consistent over test runs

* Updated test result for the merging of MCOL-5519

* Updated test results for the merging of MCOL-4632

* Updated test result for the merging of MCOL-5519

* Added missing / to path

* Improved few tests cases

* Fixed test case name

---------

Co-authored-by: root <root@rocky8.localdomain>

mysql-test/columnstore/1pmonly/r/mcs4009_autopilot_partition_management.result

@@ -39,7 +39,7 @@ lineitem	CREATE TABLE `lineitem` (
   `l_shipinstruct` char(25) DEFAULT NULL,
   `l_shipmode` char(10) DEFAULT NULL,
   `l_comment` varchar(44) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 LOAD DATA INFILE '/data/qa/source/dbt3/1g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
 LOAD DATA INFILE '/data/qa/source/dbt3/1g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
 LOAD DATA INFILE '/data/qa/source/dbt3/1g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';

mysql-test/columnstore/1pmonly/r/mcs56_cpimport_negative.result

@@ -4,10 +4,13 @@ USE mcs56_db;
 CREATE TABLE t1(col1 INT, col2 INT) ENGINE=Columnstore;
 
 Check for the correct error message:
+1
 DROP DATABASE IF EXISTS nonexist_db;
 DROP DATABASE IF EXISTS nonexist_tbl;
 
 Check for the correct error message:
+2
 
 Check for the correct error message:
+2
 DROP DATABASE mcs56_db;

mysql-test/columnstore/1pmonly/t/mcs48_cpimport_central_loc_dist_source.test

@@ -15,10 +15,10 @@ CREATE TABLE t1(col1 INT, col2 INT, col3 CHAR(8)) ENGINE=Columnstore;
 
 # Load fragmented data source files distributed across pm nodes, cpimport -m2
 # This test needs to be extended to cover multi-node setup
---exec yes | cp $MTR_SUITE_DIR/../std_data/100Krows.dat /tmp
+--exec yes | cp suite/columnstore/std_data/100Krows.dat /tmp
 
 --disable_result_log #cpimport logs thread/timestamps
---exec $MCS_CPIMPORT -m2 mcs48_db t1 -f '/tmp' -l '100Krows.dat';
+--exec cpimport -m2 mcs48_db t1 -f '/tmp' -l '100Krows.dat';
 --enable_result_log
 
 #Validate data

mysql-test/columnstore/1pmonly/t/mcs49_cpimport_parallel_dist.test

@@ -22,7 +22,7 @@ CREATE TABLE t1(col1 INT, col2 INT, col3 CHAR(8)) ENGINE=Columnstore;
 # This test needs to be extended to cover multi-node setup
 
 --disable_result_log #cpimport logs thread/timestamps
---exec $MCS_CPIMPORT -m3 mcs49_db t1 -l '$MTR_SUITE_DIR/../std_data/100Krows.dat';
+--exec cpimport -m3 mcs49_db t1 -l 'suite/columnstore/std_data/100Krows.dat';
 --enable_result_log
 
 #Validate data

mysql-test/columnstore/1pmonly/t/mcs56_cpimport_negative.test

@@ -21,12 +21,12 @@ CREATE TABLE t1(col1 INT, col2 INT) ENGINE=Columnstore;
 # Negative. Non-existing data file.
 exec rm -f /tmp/nonexisting.dat; 
 --disable_result_log #cpimport logs thread/timestamps
-exec $MCS_CPIMPORT mcs56_db t1 /tmp/nonexisting.dat 2>&1 | tee /tmp/mcs56.out;
+exec cpimport mcs56_db t1 /tmp/nonexisting.dat 2>&1 | tee /tmp/mcs56.out;
 --enable_result_log
 
 exec echo "";
 exec echo "Check for the correct error message:";
-exec grep -q "ERR  : input data file /tmp/nonexisting.dat does not exist" /tmp/mcs56.out;
+exec grep "ERR  : input data file /tmp/nonexisting.dat does not exist" /tmp/mcs56.out|wc -l;
  
 --disable_warnings
 DROP DATABASE IF EXISTS nonexist_db;
@@ -35,22 +35,22 @@ DROP DATABASE IF EXISTS nonexist_tbl;
 
 # Negative. Non-existing db.
 --disable_result_log
-exec $MCS_CPIMPORT nonexist_db t1 /tmp/nonexisting.dat 2>&1 | tee /tmp/mcs56.out;
+exec cpimport nonexist_db t1 /tmp/nonexisting.dat 2>&1 | tee /tmp/mcs56.out;
 --enable_result_log
 
 exec echo "";
 exec echo "Check for the correct error message:";
-exec grep -q "MCS-2006: 'nonexist_db.t1' does not exist in Columnstore." /tmp/mcs56.out;
+exec grep "MCS-2006: 'nonexist_db.t1' does not exist in Columnstore." /tmp/mcs56.out|wc -l;
 
 
 # Negative. Non-existing table.
 --disable_result_log
-exec $MCS_CPIMPORT mcs56_db nonexist_tbl /tmp/nonexisting.dat 2>&1 | tee /tmp/mcs56.out;
+exec cpimport mcs56_db nonexist_tbl /tmp/nonexisting.dat 2>&1 | tee /tmp/mcs56.out;
 --enable_result_log
 
 exec echo "";
 exec echo "Check for the correct error message:";
-exec grep -q "MCS-2006: 'mcs56_db.nonexist_tbl' does not exist in Columnstore." /tmp/mcs56.out;
+exec grep "MCS-2006: 'mcs56_db.nonexist_tbl' does not exist in Columnstore." /tmp/mcs56.out|wc -l;
 
 # Clean UP
 DROP DATABASE mcs56_db;

mysql-test/columnstore/autopilot/r/mcs4040_function_CNX_CAST_NM_KnownIssue.result

@@ -118,7 +118,7 @@ cidx	CTINYINT	CAST(CTINYINT AS DECIMAL(9,2))
 1	-26	-26.00
 select cidx, CDOUBLE, CAST(CDOUBLE AS SIGNED) from datatypetestm order by cidx;
 cidx	CDOUBLE	CAST(CDOUBLE AS SIGNED)
-1	-1.797693231e108	-9223372036854775806
+1	-1.797693231e108	-9223372036854775807
 select cidx, CDOUBLE, CAST(CDOUBLE AS DECIMAL(9)) from datatypetestm order by cidx;
 cidx	CDOUBLE	CAST(CDOUBLE AS DECIMAL(9))
 1	-1.797693231e108	-999999999

mysql-test/columnstore/autopilot/r/mcs4062_function_CNX_CONVERT_NM_KnownIssue.result

@@ -118,7 +118,7 @@ cidx	CTINYINT	CONVERT(CTINYINT,DECIMAL(9,2))
 1	-26	-26.00
 select cidx, CDOUBLE, CONVERT(CDOUBLE,SIGNED) from datatypetestm order by cidx;
 cidx	CDOUBLE	CONVERT(CDOUBLE,SIGNED)
-1	-1.797693231e108	-9223372036854775806
+1	-1.797693231e108	-9223372036854775807
 select cidx, CDOUBLE, CONVERT(CDOUBLE,DECIMAL(9)) from datatypetestm order by cidx;
 cidx	CDOUBLE	CONVERT(CDOUBLE,DECIMAL(9))
 1	-1.797693231e108	-999999999

mysql-test/columnstore/autopilot/r/mcs4265_function_CNXPP_CAST_NM_KnownIssue.result

@@ -118,7 +118,7 @@ cidx	CTINYINT	CAST(CTINYINT AS DECIMAL(9,2))
 1	-26	-26.00
 select cidx, CDOUBLE, CAST(CDOUBLE AS SIGNED) from datatypetestm order by cidx;
 cidx	CDOUBLE	CAST(CDOUBLE AS SIGNED)
-1	-1.797693231e108	-9223372036854775806
+1	-1.797693231e108	-9223372036854775807
 select cidx, CDOUBLE, CAST(CDOUBLE AS DECIMAL(9)) from datatypetestm order by cidx;
 cidx	CDOUBLE	CAST(CDOUBLE AS DECIMAL(9))
 1	-1.797693231e108	-999999999

mysql-test/columnstore/autopilot/r/mcs4287_function_CNXPP_CONVERT_NM_KnownIssue.result

@@ -118,7 +118,7 @@ cidx	CTINYINT	CONVERT(CTINYINT,DECIMAL(9,2))
 1	-26	-26.00
 select cidx, CDOUBLE, CONVERT(CDOUBLE,SIGNED) from datatypetestm order by cidx;
 cidx	CDOUBLE	CONVERT(CDOUBLE,SIGNED)
-1	-1.797693231e108	-9223372036854775806
+1	-1.797693231e108	-9223372036854775807
 select cidx, CDOUBLE, CONVERT(CDOUBLE,DECIMAL(9)) from datatypetestm order by cidx;
 cidx	CDOUBLE	CONVERT(CDOUBLE,DECIMAL(9))
 1	-1.797693231e108	-999999999

mysql-test/columnstore/basic/r/mcol-5005.result

@@ -34,13 +34,13 @@ SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_romanian_ci DEFAULT NULL,
-  `b` varchar(15) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+  `b` varchar(15) DEFAULT NULL,
   `c` varchar(15) CHARACTER SET latin2 COLLATE latin2_croatian_ci DEFAULT NULL,
   `d` tinyblob DEFAULT NULL,
   `e` int(11) DEFAULT NULL,
   `f` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_icelandic_ci DEFAULT NULL,
   `g` varchar(15) CHARACTER SET latin2 COLLATE latin2_croatian_ci DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (

mysql-test/columnstore/bugfixes/mcol-5522.result

@@ -10,27 +10,27 @@ create table t4 (a varchar(200)) engine=columnstore;
 insert into t3 values ("one"), ("two"), ("three");
 insert into t4 values ("one"), ("two"), ("three");
 set session columnstore_max_pm_join_result_count=1;
-select * from t1, t2 where t1.a = t2.a;
+select * from t1, t2 where t1.a = t2.a order by t1.a, t2.a;
 a	a
 1	1
 2	2
 3	3
 4	4
-select * from t3, t4 where t3.a = t4.a;
+select * from t3, t4 where t3.a = t4.a order by t3.a, t4.a;
 a	a
 one	one
-two	two
 three	three
+two	two
 set session columnstore_max_pm_join_result_count=1048576;
-select * from t1, t2 where t1.a = t2.a;
+select * from t1, t2 where t1.a = t2.a order by t1.a, t2.a;
 a	a
 1	1
 2	2
 3	3
 4	4
-select * from t3, t4 where t3.a = t4.a;
+select * from t3, t4 where t3.a = t4.a order by t3.a, t4.a;
 a	a
 one	one
-two	two
 three	three
+two	two
 DROP DATABASE mcol_5522;

mysql-test/columnstore/bugfixes/mcol-5522.test

@@ -17,12 +17,12 @@ insert into t3 values ("one"), ("two"), ("three");
 insert into t4 values ("one"), ("two"), ("three");
 
 set session columnstore_max_pm_join_result_count=1;
-select * from t1, t2 where t1.a = t2.a;
+select * from t1, t2 where t1.a = t2.a order by t1.a, t2.a;
-select * from t3, t4 where t3.a = t4.a;
+select * from t3, t4 where t3.a = t4.a order by t3.a, t4.a;
 
 set session columnstore_max_pm_join_result_count=1048576;
-select * from t1, t2 where t1.a = t2.a;
+select * from t1, t2 where t1.a = t2.a order by t1.a, t2.a;
-select * from t3, t4 where t3.a = t4.a;
+select * from t3, t4 where t3.a = t4.a order by t3.a, t4.a;
 
 --disable_warnings
 DROP DATABASE mcol_5522;

mysql-test/columnstore/setup/regression_env_setup.test

@@ -68,7 +68,7 @@ USE outerjoin;
 #
 # Set table name to case insensitive
 --exec if test -f /etc/my.cnf.d/server.cnf; then sed -i 's/\[mysqld\]/\[mysqld\]\nlower_case_table_names=1/g' /etc/my.cnf.d/server.cnf; fi
---exec if test -f etc/mysql/mariadb.conf.d/50.server.cnf; then sed -i 's/\[mysqld\]/\[mysqld\]\nlower_case_table_names=1/g' /etc/mysql/mariadb.conf.d/50-server.cnf; fi
+--exec if test -f /etc/mysql/mariadb.conf.d/50.server.cnf; then sed -i 's/\[mysqld\]/\[mysqld\]\nlower_case_table_names=1/g' /etc/mysql/mariadb.conf.d/50-server.cnf; fi
 #
 --exec systemctl restart mariadb
 --exec sleep 10