diff --git a/mysql-test/main/global_temporary_table.result b/mysql-test/main/global_temporary_table.result index 2fcbaccec1047..3b8cc01e639e0 100644 --- a/mysql-test/main/global_temporary_table.result +++ b/mysql-test/main/global_temporary_table.result @@ -1007,9 +1007,10 @@ create global temporary table t (t text); set max_session_mem_used= 8192; insert t values (0); 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= 32768; lock table t write; alter table t add z int; -ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --max-session-mem-used=32768 option so it cannot execute this statement set max_session_mem_used= default; drop table t; unlock tables; @@ -1250,6 +1251,7 @@ c set max_session_mem_used=8192; truncate t; 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= 32768; set max_session_mem_used= default; unlock tables; select * from t; diff --git a/mysql-test/main/global_temporary_table.test b/mysql-test/main/global_temporary_table.test index 96d3aa6fe1ed2..39f743bdd68e8 100644 --- a/mysql-test/main/global_temporary_table.test +++ b/mysql-test/main/global_temporary_table.test @@ -877,7 +877,9 @@ create global temporary table t (t text); set max_session_mem_used= 8192; --error ER_OPTION_PREVENTS_STATEMENT insert t values (0); +set max_session_mem_used= 32768; lock table t write; + --error ER_OPTION_PREVENTS_STATEMENT alter table t add z int; set max_session_mem_used= default; @@ -1121,6 +1123,7 @@ select * from t; set max_session_mem_used=8192; --error ER_OPTION_PREVENTS_STATEMENT truncate t; +set max_session_mem_used= 32768; set max_session_mem_used= default; unlock tables; select * from t; diff --git a/mysql-test/suite/binlog/r/global_temporary_table.result b/mysql-test/suite/binlog/r/global_temporary_table.result index 5b50d474c5de6..ef856a085a644 100644 --- a/mysql-test/suite/binlog/r/global_temporary_table.result +++ b/mysql-test/suite/binlog/r/global_temporary_table.result @@ -1010,9 +1010,10 @@ create global temporary table t (t text); set max_session_mem_used= 8192; insert t values (0); 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= 32768; lock table t write; alter table t add z int; -ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --max-session-mem-used=32768 option so it cannot execute this statement set max_session_mem_used= default; drop table t; unlock tables; @@ -1253,6 +1254,7 @@ c set max_session_mem_used=8192; truncate t; 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= 32768; set max_session_mem_used= default; unlock tables; select * from t; diff --git a/mysql-test/suite/rpl/r/global_temporary_table.result b/mysql-test/suite/rpl/r/global_temporary_table.result index 084c1be619dd9..230179daed891 100644 --- a/mysql-test/suite/rpl/r/global_temporary_table.result +++ b/mysql-test/suite/rpl/r/global_temporary_table.result @@ -1010,9 +1010,10 @@ create global temporary table t (t text); set max_session_mem_used= 8192; insert t values (0); 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= 32768; lock table t write; alter table t add z int; -ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --max-session-mem-used=32768 option so it cannot execute this statement set max_session_mem_used= default; drop table t; unlock tables; @@ -1253,6 +1254,7 @@ c set max_session_mem_used=8192; truncate t; 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= 32768; set max_session_mem_used= default; unlock tables; select * from t;