database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fixed bug in alter_table_lock.result

Browse Source 
Before this change the test could abort with ER_OPTION_PREVENTS_STATEMENT
This commit is contained in:
Monty
2022-05-05 09:51:49 +03:00
parent daa2680c78
commit f7dd8799e7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/alter_table_lock.result
View File

@@ -11,8 +11,6 @@ ERROR 42S02: Table 'test.x' doesn't exist
SET SESSION max_session_mem_used= 8192; SET SESSION max_session_mem_used= 8192;
LOCK TABLE t1 WRITE; LOCK TABLE t1 WRITE;
ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT; ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
Warnings:
Note 1054 Unknown column 'b' in 't1'
SET SESSION max_session_mem_used = @max_session_mem_used_save; SET SESSION max_session_mem_used = @max_session_mem_used_save;
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;

4
mysql-test/main/alter_table_lock.test
View File

@@ -14,9 +14,13 @@ SELECT * FROM t1;
ALTER TABLE x MODIFY xx INT; ALTER TABLE x MODIFY xx INT;
SET SESSION max_session_mem_used= 8192; SET SESSION max_session_mem_used= 8192;
--error 0,ER_OPTION_PREVENTS_STATEMENT
LOCK TABLE t1 WRITE; LOCK TABLE t1 WRITE;
--disable_warnings
--error 0,ER_OPTION_PREVENTS_STATEMENT
ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT; ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
--enable_warnings
SET SESSION max_session_mem_used = @max_session_mem_used_save; SET SESSION max_session_mem_used = @max_session_mem_used_save;
UNLOCK TABLES; UNLOCK TABLES;