mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 15:45:33 +02:00
Avoid some failures WITH_MSAN
This commit is contained in:
parent
cc1d906211
commit
13076bd314
6 changed files with 49 additions and 40 deletions
|
|
@ -3415,23 +3415,5 @@ ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITH
|
|||
delete from t1 where a = 11;
|
||||
drop table t1;
|
||||
#
|
||||
# MDEV-23836: Assertion `! is_set() || m_can_overwrite_status' in
|
||||
# Diagnostics_area::set_error_status (interrupted ALTER TABLE under LOCK)
|
||||
#
|
||||
SET @max_session_mem_used_save= @@max_session_mem_used;
|
||||
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;
|
||||
Warnings:
|
||||
Note 1054 Unknown column 'b' in 't1'
|
||||
SET SESSION max_session_mem_used = @max_session_mem_used_save;
|
||||
UNLOCK TABLES;
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# End of 10.5 tests
|
||||
#
|
||||
|
|
|
|||
|
|
@ -2661,28 +2661,6 @@ delete from t1 where a = 11;
|
|||
# cleanup
|
||||
drop table t1;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-23836: Assertion `! is_set() || m_can_overwrite_status' in
|
||||
--echo # Diagnostics_area::set_error_status (interrupted ALTER TABLE under LOCK)
|
||||
--echo #
|
||||
|
||||
SET @max_session_mem_used_save= @@max_session_mem_used;
|
||||
|
||||
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;
|
||||
LOCK TABLE t1 WRITE;
|
||||
|
||||
ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
|
||||
|
||||
SET SESSION max_session_mem_used = @max_session_mem_used_save;
|
||||
UNLOCK TABLES;
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.5 tests
|
||||
--echo #
|
||||
|
|
|
|||
19
mysql-test/main/alter_table_lock.result
Normal file
19
mysql-test/main/alter_table_lock.result
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
#
|
||||
# MDEV-23836: Assertion `! is_set() || m_can_overwrite_status' in
|
||||
# Diagnostics_area::set_error_status (interrupted ALTER TABLE under LOCK)
|
||||
#
|
||||
SET @max_session_mem_used_save= @@max_session_mem_used;
|
||||
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;
|
||||
Warnings:
|
||||
Note 1054 Unknown column 'b' in 't1'
|
||||
SET SESSION max_session_mem_used = @max_session_mem_used_save;
|
||||
UNLOCK TABLES;
|
||||
DROP TABLE t1;
|
||||
# End of 10.5 tests
|
||||
25
mysql-test/main/alter_table_lock.test
Normal file
25
mysql-test/main/alter_table_lock.test
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
--source include/not_msan.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 #
|
||||
|
||||
SET @max_session_mem_used_save= @@max_session_mem_used;
|
||||
|
||||
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;
|
||||
LOCK TABLE t1 WRITE;
|
||||
|
||||
ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
|
||||
|
||||
SET SESSION max_session_mem_used = @max_session_mem_used_save;
|
||||
UNLOCK TABLES;
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo # End of 10.5 tests
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
--source include/default_optimizer_switch.inc
|
||||
# This is too slow on MSAN
|
||||
--source include/not_msan.inc
|
||||
--source include/not_valgrind.inc
|
||||
|
||||
create table t1 (a int, b varchar(32));
|
||||
insert into t1 values
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
# We are crashing the server on purpose
|
||||
--source include/not_valgrind.inc
|
||||
--source include/not_crashrep.inc
|
||||
# This often fails under MSAN builder due timing differences
|
||||
--source include/not_msan.inc
|
||||
|
||||
# The test does work with any page size, but we want to reduce the
|
||||
# test running time by limiting the combinations. The redo log format
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue