make tests compatible with 12.1

mysql-test/columnstore/basic/t/MCOL-5056-text-is-not-blob.test

@@ -36,7 +36,8 @@ SELECT * FROM t3i, t3c WHERE t3i.ci=t3c.ac;
 SELECT * FROM t3i, t3c WHERE t3i.ai=t3c.cc;
 SELECT * FROM t3i, t3c WHERE t3i.ci=t3c.cc;
 
-
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE MCOL5056;
 

mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.test

@@ -31,5 +31,7 @@ SELECT COUNT(*) FROM (SELECT * FROM t1 PARTITION (p0)) tt;
 
 SELECT COUNT(*) FROM (SELECT * FROM t2 UNION ALL SELECT * FROM t1 PARTITION (p0)) tt;
 REVOKE ALL PRIVILEGES ON *.* FROM 'cejuser'@'localhost';
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE MCOL5886;

mysql-test/columnstore/basic/t/mcol-424.test

@@ -58,5 +58,7 @@ insert  into `member_test`(`id`,`name`) values (3,'member 3');
 SELECT * FROM trans_test t WHERE t.`member_id` IN (SELECT id FROM member_test WHERE id =1);
 
 # Clean UP
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE mcol424;

mysql-test/columnstore/basic/t/mcs19_grant_revoke.test

@@ -79,5 +79,7 @@ CREATE TABLE mcs19_db.t1;
 connection default;
 SET default_storage_engine=default;
 DROP DATABASE mcs19_db;
+--disable_warnings
 DROP USER 'user'@'localhost';
 DROP USER 'user1'@'localhost';
+--enable_warnings

mysql-test/columnstore/basic/t/mcs44_select_crossengine_join.test

@@ -51,5 +51,7 @@ SELECT * FROM t1;
 SELECT * FROM t2;
 
 # Clean UP
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE mcs44_db;

mysql-test/columnstore/basic/t/mcs45_write_crossengine_join.test

@@ -79,5 +79,7 @@ UPDATE idb dest JOIN mcs src ON dest.a=src.a SET dest.b = dest.b + src.b + 100;
 SELECT * FROM idb;
 
 # Clean UP
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE mcs45_db;

mysql-test/columnstore/basic/t/mcs63_crossengine_views.test

@@ -150,5 +150,7 @@ DROP VIEW v1,v2;
 DROP TABLE tt,t2,t1;
 
 # Clean UP
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE mcs63_db;

mysql-test/columnstore/basic/t/mcs64_crossengine_group_by.test

@@ -69,5 +69,7 @@ SELECT SUM(t1.t1_int) FROM t1 RIGHT JOIN t2 ON t1.t1_int = t2.t2_int GROUP BY t2
 SELECT SUM(t1.t1_int) FROM t1 RIGHT JOIN t2 ON t1.t1_int = t2.t2_int GROUP BY t2.t2_char;
 
 # Clean UP
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE mcs64_db;

mysql-test/columnstore/basic/t/mcs65_crossengine_order_by.test

@@ -76,5 +76,7 @@ SELECT * FROM t1 RIGHT JOIN t2 ON t1.t1_int = t2.t2_int ORDER BY t2.t2_char DESC
 SELECT * FROM t1 RIGHT JOIN t2 ON t1.t1_int = t2.t2_int ORDER BY t2.t2_char ASC, t2.t2_int ASC, t1.t1_int ASC;
 
 # Clean UP
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE mcs65_db;

mysql-test/columnstore/basic/t/mcs71_crossengine_where_groupby_orderby_limit.test

@@ -69,5 +69,7 @@ SELECT SUM(t1.t1_int) FROM t1 RIGHT JOIN t2 ON t1.t1_int = t2.t2_int GROUP BY t2
 SELECT SUM(t1.t1_int) FROM t1 RIGHT JOIN t2 ON t1.t1_int = t2.t2_int GROUP BY t2.t2_int ORDER BY t2.t2_int LIMIT -1;
 
 # Clean UP
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE mcs71_db;

mysql-test/columnstore/basic/t/mcs79_exists.test

@@ -62,5 +62,7 @@ SELECT t4_int FROM t4 WHERE EXISTS (SELECT t2_int FROM t2 WHERE t4.t4_int = t2.t
 SELECT t4_int FROM t4 WHERE NOT EXISTS (SELECT t2_int FROM t2 WHERE t4.t4_int = t2.t2_int);
 	
 # Clean UP
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE mcs79_db;

mysql-test/columnstore/basic/t/mcs80_set_operations.test

@@ -131,5 +131,7 @@ SELECT t1_int, 'Integer' AS Table1 FROM t1 EXCEPT SELECT t3_int, 'Integer' AS Ta
 SELECT t1_int, 'Integer' AS Table1 FROM t1 EXCEPT SELECT t2_int, 'Integer' AS Table2 FROM t2 order by t2_int;	
 
 # Clean UP
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE mcs80_db;

mysql-test/columnstore/basic/t/mcs85_derived_table.test

@@ -61,5 +61,7 @@ SELECT t4.a, t.a FROM t4 LEFT JOIN (SELECT * FROM t2) t ON t.a = t4.a ORDER BY t
 SELECT t4.a, t.a FROM t4 RIGHT JOIN (SELECT * FROM t2) t ON t.a = t4.a ORDER BY t.a, t4.a;
 
 # Clean UP
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE mcs85_db;

mysql-test/columnstore/basic/t/mcs90_aggregate_functions.test

@@ -67,5 +67,7 @@ SELECT t1.b, MAX(t1.a) FROM t1 JOIN t3 ON t1.a = t3.a GROUP BY t1.b ORDER BY 1;
 SELECT t1.b, MIN(t1.a) FROM t1 JOIN t3 ON t1.a = t3.a GROUP BY t1.b ORDER BY 1;
 
 # Clean UP
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE mcs90_db;

mysql-test/columnstore/basic/t/mdev-25080.test

@@ -202,6 +202,8 @@ DELETE FROM t1; DELETE FROM t2;
 SELECT a FROM (SELECT a FROM t1 UNION SELECT a FROM t2) AS sub ORDER BY a;
 EXPLAIN SELECT a FROM (SELECT a FROM t1 UNION SELECT a FROM t2) AS sub ORDER BY a;
 
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP TABLE t1, t2, t3, t4;
 DROP DATABASE mdev25080;

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

@@ -53,5 +53,7 @@ JOIN
 USING (col1);
 
 # Cleanup
+--disable_warnings
 DROP USER 'cejuser'@'localhost';
+--enable_warnings
 DROP DATABASE `mcol_4874`;