Skip to content

Commit 4d5585f

Browse files
committed
fixed
1 parent a104ea0 commit 4d5585f

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

mysql-test/main/global_temporary_table.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,7 @@ insert t values (0);
881881
lock table t write;
882882
--error ER_OPTION_PREVENTS_STATEMENT
883883
alter table t add z int;
884+
--error 0, ER_OPTION_PREVENTS_STATEMENT
884885
set max_session_mem_used= default;
885886
drop table t;
886887
unlock tables;

sql/handler.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6748,7 +6748,7 @@ int ha_create_table(THD *thd, const char *path, const char *db,
67486748
// open an frm file
67496749
share.db_plugin= ha_lock_engine(thd, create_info->db_type);
67506750

6751-
if (open_table_def(thd, &share))
6751+
if (open_table_def(thd, &share) || thd->killed)
67526752
goto err;
67536753
}
67546754

0 commit comments

Comments
 (0)