Merge branch '10.6' into bb-10.11-release

Author: sanja-byelkin

mysql-test/main/alter_table_lock.result

@@ -125,13 +125,4 @@ SELECT f1(1);
 Got one of the listed errors
 DROP FUNCTION f1;
 SET debug_dbug= @saved_dbug;
-#
-# MDEV-27978 wrong option name in error when exceeding max_session_mem_used
-#
-SET SESSION max_session_mem_used = 8192;
-SELECT * FROM information_schema.processlist;
-ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement
-SET SESSION max_session_mem_used = DEFAULT;
-#
 # End of 10.2 tests
-#

mysql-test/main/alter_table_lock.test

@@ -144,8 +144,6 @@ SELECT a FROM t1 ORDER BY rand(1);
 --echo #cleanup
 DROP TABLE t1, pid_table;
 
-
-
 --echo #
 --echo # MDEV-12416 OOM in create_virtual_tmp_table() makes the server crash
 --echo #
@@ -158,15 +156,4 @@ SELECT f1(1);
 DROP FUNCTION f1;
 SET debug_dbug= @saved_dbug;
 
---echo #
---echo # MDEV-27978 wrong option name in error when exceeding max_session_mem_used
---echo #
-SET SESSION max_session_mem_used = 8192;
---error ER_OPTION_PREVENTS_STATEMENT
-SELECT * FROM information_schema.processlist;
-SET SESSION max_session_mem_used = DEFAULT;
-
-
---echo #
 --echo # End of 10.2 tests
---echo #

mysql-test/main/error_simulation.result

@@ -1,4 +1,3 @@
-drop table if exists t1;
 insert into t1 values(1);
 ERROR 42S02: Table 'test.t1' doesn't exist
 delete from t1;
@@ -170,12 +169,6 @@ UPDATE t1 SET a = 'new'
 WHERE COLUMN_CREATE( 1, 'v', 1, 'w' ) IS NULL;
 ERROR 22007: Illegal value used as argument of dynamic column function
 drop table t1;
-set @max_session_mem_used_save= @@max_session_mem_used;
-set max_session_mem_used = 50000;
-select * from seq_1_to_1000;
-set max_session_mem_used = 8192;
-select * from seq_1_to_1000;
-set max_session_mem_used = @max_session_mem_used_save;
 #
 # MDEV-20604: Duplicate key value is silently truncated to 64
 # characters in print_keydup_error
@@ -231,16 +224,3 @@ Error	1327	Undeclared variable: foo
 Error	1305	PROCEDURE P1 does not exist
 drop procedure P1;
 # End of 10.4 tests
-#
-# MDEV-35828: Assertion fails in alloc_root() when memory causes it to call itself
-#
-CREATE TEMPORARY TABLE t1 (a INT,b INT);
-INSERT INTO t1 VALUES (1,1),(2,2);
-SET
-@tmp=@@max_session_mem_used,
-max_session_mem_used=8192;
-SELECT * FROM (t1 AS t2 LEFT JOIN t1 AS t3 USING (a)),t1;
-ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement
-DROP TABLE t1;
-SET max_session_mem_used=@tmp;
-# End of 10.6 tests

mysql-test/main/error_simulation.test

@@ -3,31 +3,28 @@
 #
 --source include/have_sequence.inc
 
---disable_warnings
-drop table if exists t1;
---enable_warnings
---error 1146
+--error ER_NO_SUCH_TABLE
 insert into t1 values(1);
---error 1146
+--error ER_NO_SUCH_TABLE
 delete from t1;
---error 1146
+--error ER_NO_SUCH_TABLE
 update t1 set a=1;
 create table t1 (a int);
---error 1054
+--error ER_BAD_FIELD_ERROR
 select count(test.t1.b) from t1;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select count(not_existing_database.t1) from t1;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select count(not_existing_database.t1.a) from t1;
---error 1044,1146
+--error ER_DBACCESS_DENIED_ERROR,ER_NO_SUCH_TABLE
 select count(not_existing_database.t1.a) from not_existing_database.t1;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select 1 from t1 order by 2;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select 1 from t1 group by 2;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select 1 from t1 order by t1.b;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select count(*),b from t1;
 drop table t1;
 
@@ -36,10 +33,10 @@ drop table t1;
 #
 # Bug #6080: Error message for a field with a display width that is too long
 #
---error 1439
+--error ER_TOO_BIG_DISPLAYWIDTH
 create table t1 (a int(256));
 set sql_mode='traditional';
---error 1074
+--error ER_TOO_BIG_FIELDLENGTH
 create table t1 (a varchar(66000));
 set sql_mode=default;
 
@@ -95,7 +92,7 @@ delimiter ;|
 
 flush status;
 --disable_ps2_protocol
---error 1062
+--error ER_DUP_ENTRY
 select f1(), f2();
 --enable_ps2_protocol
 show status like 'Com_insert';
@@ -202,24 +199,6 @@ UPDATE t1 SET a = 'new'
 WHERE COLUMN_CREATE( 1, 'v', 1, 'w' ) IS NULL;
 drop table t1;
 
-#
-# errors caused by max_session_mem_used
-#
-set @max_session_mem_used_save= @@max_session_mem_used;
-
---disable_result_log
-set max_session_mem_used = 50000;
---error 0,ER_OPTION_PREVENTS_STATEMENT
-select * from seq_1_to_1000;
-set max_session_mem_used = 8192;
---error 0,ER_OPTION_PREVENTS_STATEMENT
-select * from seq_1_to_1000;
---enable_result_log
-# We may not be able to execute any more queries with this connection
-# because of too little memory#
-
-set max_session_mem_used = @max_session_mem_used_save;
-
 --echo #
 --echo # MDEV-20604: Duplicate key value is silently truncated to 64
 --echo # characters in print_keydup_error
@@ -283,24 +262,4 @@ show warnings;
 
 drop procedure P1;
 
--- echo # End of 10.4 tests
-
-
---echo #
---echo # MDEV-35828: Assertion fails in alloc_root() when memory causes it to call itself
---echo #
-CREATE TEMPORARY TABLE t1 (a INT,b INT);
-INSERT INTO t1 VALUES (1,1),(2,2);
-
-SET
-  @tmp=@@max_session_mem_used,
-  max_session_mem_used=8192;
-
---error ER_OPTION_PREVENTS_STATEMENT
-SELECT * FROM (t1 AS t2 LEFT JOIN t1 AS t3 USING (a)),t1;
-
-DROP TABLE t1;
-SET max_session_mem_used=@tmp;
-
-
---echo # End of 10.6 tests
+--echo # End of 10.4 tests

mysql-test/main/errors.result

@@ -5414,8 +5414,14 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 #
-# End of 10.6 tests
+# MDEV-37947 Item_func_hex doesn't check for max_allowed_packet
 #
+select hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex('\\'))))))))))))))))))))))))))))))))))))))))))))) as x;
+x
+NULL
+Warnings:
+Warning	1301	Result of hex() was larger than max_allowed_packet (16777216) - truncated
+# End of 10.6 tests
 #
 # MDEV-25704 Function random_bytes
 #

mysql-test/main/errors.test

@@ -2448,8 +2448,11 @@ SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
 --echo #
---echo # End of 10.6 tests
+--echo # MDEV-37947 Item_func_hex doesn't check for max_allowed_packet
 --echo #
+select hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex(hex('\\'))))))))))))))))))))))))))))))))))))))))))))) as x;
+
+--echo # End of 10.6 tests
 
 --echo #
 --echo # MDEV-25704 Function random_bytes

mysql-test/main/func_str.result

@@ -0,0 +1,48 @@
+#
+# MDEV-23836: Assertion `! is_set() || m_can_overwrite_status' in
+# Diagnostics_area::set_error_status (interrupted ALTER TABLE under LOCK)
+#
+CREATE TABLE t1 (a INT);
+SELECT * FROM t1;
+a
+ALTER TABLE x MODIFY xx INT;
+ERROR 42S02: Table 'test.x' doesn't exist
+SET SESSION max_session_mem_used= 8192;
+LOCK TABLE t1 WRITE;
+ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
+SET SESSION max_session_mem_used = DEFAULT;
+UNLOCK TABLES;
+DROP TABLE t1;
+#
+# MDEV-27978 wrong option name in error when exceeding max_session_mem_used
+#
+SET SESSION max_session_mem_used = 8192;
+SELECT * FROM information_schema.processlist;
+ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement
+SET SESSION max_session_mem_used = DEFAULT;
+set max_session_mem_used = 50000;
+select * from seq_1_to_1000;
+set max_session_mem_used = 8192;
+select * from seq_1_to_1000;
+set max_session_mem_used = DEFAULT;
+#
+# MDEV-35828: Assertion fails in alloc_root() when memory causes it to call itself
+#
+CREATE TEMPORARY TABLE t1 (a INT,b INT);
+INSERT INTO t1 VALUES (1,1),(2,2);
+SET max_session_mem_used=8192;
+SELECT * FROM (t1 AS t2 LEFT JOIN t1 AS t3 USING (a)),t1;
+ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement
+SET max_session_mem_used=DEFAULT;
+DROP TABLE t1;
+#
+# MDEV-23824 SIGSEGV in end_io_cache on REPAIR LOCAL TABLE for Aria table
+#
+CREATE TABLE t1 (i INT) ENGINE=Aria;
+INSERT INTO t1 VALUES (1);
+SET max_session_mem_used=50000;
+REPAIR LOCAL TABLE t1 USE_FRM;
+REPAIR LOCAL TABLE t1;
+DROP TABLE t1;
+SET max_session_mem_used=default;
+# End of 10.6 tests

mysql-test/main/func_str.test

@@ -0,0 +1,85 @@
+# memory usage is sensitive to valgrind/ps-protocol/embedded
+source include/not_msan.inc;
+source include/not_valgrind.inc;
+source include/no_protocol.inc;
+source include/not_embedded.inc;
+source include/have_64bit.inc;
+source include/have_sequence.inc;
+
+--echo #
+--echo # MDEV-23836: Assertion `! is_set() || m_can_overwrite_status' in
+--echo # Diagnostics_area::set_error_status (interrupted ALTER TABLE under LOCK)
+--echo #
+
+CREATE TABLE t1 (a INT);
+SELECT * FROM t1;
+
+--error ER_NO_SUCH_TABLE
+ALTER TABLE x MODIFY xx INT;
+
+SET SESSION max_session_mem_used= 8192;
+--error 0,ER_OPTION_PREVENTS_STATEMENT
+LOCK TABLE t1 WRITE;
+
+--disable_warnings
+--error 0,ER_OPTION_PREVENTS_STATEMENT
+ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
+--enable_warnings
+
+SET SESSION max_session_mem_used = DEFAULT;
+UNLOCK TABLES;
+DROP TABLE t1;
+
+--echo #
+--echo # MDEV-27978 wrong option name in error when exceeding max_session_mem_used
+--echo #
+SET SESSION max_session_mem_used = 8192;
+--error ER_OPTION_PREVENTS_STATEMENT
+SELECT * FROM information_schema.processlist;
+SET SESSION max_session_mem_used = DEFAULT;
+
+#
+# errors caused by max_session_mem_used
+#
+--disable_result_log
+set max_session_mem_used = 50000;
+--error 0,ER_OPTION_PREVENTS_STATEMENT
+select * from seq_1_to_1000;
+set max_session_mem_used = 8192;
+--error 0,ER_OPTION_PREVENTS_STATEMENT
+select * from seq_1_to_1000;
+--enable_result_log
+# We may not be able to execute any more queries with this connection
+# because of too little memory
+
+set max_session_mem_used = DEFAULT;
+
+--echo #
+--echo # MDEV-35828: Assertion fails in alloc_root() when memory causes it to call itself
+--echo #
+CREATE TEMPORARY TABLE t1 (a INT,b INT);
+INSERT INTO t1 VALUES (1,1),(2,2);
+
+SET max_session_mem_used=8192;
+
+--error ER_OPTION_PREVENTS_STATEMENT
+SELECT * FROM (t1 AS t2 LEFT JOIN t1 AS t3 USING (a)),t1;
+
+SET max_session_mem_used=DEFAULT;
+DROP TABLE t1;
+
+--echo #
+--echo # MDEV-23824 SIGSEGV in end_io_cache on REPAIR LOCAL TABLE for Aria table
+--echo #
+
+CREATE TABLE t1 (i INT) ENGINE=Aria;
+INSERT INTO t1 VALUES (1);
+SET max_session_mem_used=50000;
+--disable_result_log
+REPAIR LOCAL TABLE t1 USE_FRM;
+REPAIR LOCAL TABLE t1;
+--enable_result_log
+DROP TABLE t1;
+SET max_session_mem_used=default;
+
+--echo # End of 10.6 tests