database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge few bug fixes from 5.6

Browse Source
This commit is contained in:
Sergei Golubchik
2013-07-17 18:51:12 +02:00
parent 1b82512914
commit c1d6a2d7e1
18 changed files with 1278 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mysql-test/r/partition_debug_sync.result
View File

@ -5,7 +5,9 @@ SET DEBUG_SYNC= 'RESET';
# Test when remove partitioning is done while drop table is waiting
# for the table.
# After MDL was introduced, there is no longer any race, so test is done
# by adding a small sleep to verify that the delete waits.
# by adding a small sleep to verify that the delete waits. This happens
# only until ALTER tries to upgrade its MDL lock, which ends up in MDL
# deadlock which is correctly reported.
# Con 1
SET DEBUG_SYNC= 'RESET';
CREATE TABLE t1
@ -64,3 +66,27 @@ SET DEBUG_SYNC= 'RESET';
# Con default
SET DEBUG_SYNC= 'RESET';
End of 5.1 tests
#
# Coverage test for non pruned ha_partition::store_lock()
#
CREATE TABLE t1 (a int) ENGINE = InnoDB;
CREATE TABLE t2 (a int PRIMARY KEY)
ENGINE = InnoDB PARTITION BY HASH (a) PARTITIONS 3;
HANDLER t1 OPEN;
# Con1
LOCK TABLES t1 WRITE, t2 READ;
# Default
SET DEBUG_SYNC="wait_for_lock SIGNAL locking";
INSERT INTO t2 VALUES (1), (2), (3);
# Con1
SET DEBUG_SYNC="now WAIT_FOR locking";
ALTER TABLE t1 ADD COLUMN b int;
# Default
ERROR HY000: Wait on a lock was aborted due to a pending exclusive lock
SELECT 1;
1
1
# Con1
UNLOCK TABLES;
# Default
DROP TABLE t1, t2;