Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mysql-test/main/global_temporary_table.result
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,7 @@ 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
lock table t write;
ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement
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
set max_session_mem_used= default;
Expand Down
1 change: 1 addition & 0 deletions mysql-test/main/global_temporary_table.test
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,7 @@ create global temporary table t (t text);
set max_session_mem_used= 8192;
--error ER_OPTION_PREVENTS_STATEMENT
insert t values (0);
--error ER_OPTION_PREVENTS_STATEMENT
lock table t write;
--error ER_OPTION_PREVENTS_STATEMENT
alter table t add z int;
Expand Down
1 change: 1 addition & 0 deletions mysql-test/suite/binlog/r/global_temporary_table.result
Original file line number Diff line number Diff line change
Expand Up @@ -1011,6 +1011,7 @@ 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
lock table t write;
ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement
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
set max_session_mem_used= default;
Expand Down
1 change: 1 addition & 0 deletions mysql-test/suite/rpl/r/global_temporary_table.result
Original file line number Diff line number Diff line change
Expand Up @@ -1011,6 +1011,7 @@ 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
lock table t write;
ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement
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
set max_session_mem_used= default;
Expand Down
5 changes: 4 additions & 1 deletion sql/sql_parse.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5038,7 +5038,10 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
{
if (thd->variables.query_cache_wlock_invalidate)
query_cache_invalidate_locked_for_write(thd, first_table);
my_ok(thd);
if (!thd->killed)
{
my_ok(thd);
}
}
break;
case SQLCOM_BACKUP:
Expand Down
Loading