mirror of
https://github.com/MariaDB/server.git
synced 2025-11-22 17:44:29 +03:00
baca1a40e9
disable test cases for bugs not fixed in xtradb. mysql-test/suite/innodb/t/innodb-lock.test: instead of disabling the test in disabled.def (hoping that somebody someday will enable it), skip it only for xtradb (not for innodb), and only for the current xtradb version. the test will enable itself automatically on the next xtradb merge mysql-test/suite/innodb/t/innodb_cmp_drop_table.test: instead of disabling the test in disabled.def (hoping that somebody someday will enable it), skip it only for xtradb (not for innodb), and only for the current xtradb version. the test will enable itself automatically on the next xtradb merge mysql-test/suite/innodb/t/innodb_corrupt_bit.test: fix the error number storage/innobase/handler/ha_innodb.cc: fix the error number storage/xtradb/handler/ha_innodb.cc: fix the error number
174 lines
4.0 KiB
Plaintext
174 lines
4.0 KiB
Plaintext
if (`select plugin_auth_version <= "1.1.8-20.1" from information_schema.plugins where plugin_name='innodb'`)
|
|
{
|
|
--skip Not supported by XtraDB 1.1.8-20.1 or earlier
|
|
}
|
|
|
|
#
|
|
# Check and select innodb lock type
|
|
#
|
|
|
|
set global innodb_table_locks=1;
|
|
|
|
select @@innodb_table_locks;
|
|
|
|
#
|
|
# Testing of explicit table locks with enforced table locks
|
|
#
|
|
|
|
connect (con1,localhost,root,,);
|
|
connect (con2,localhost,root,,);
|
|
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
#
|
|
# Testing of explicit table locks with enforced table locks
|
|
#
|
|
|
|
set @@innodb_table_locks=1;
|
|
|
|
connection con1;
|
|
create table t1 (id integer, x integer) engine=INNODB;
|
|
insert into t1 values(0, 0);
|
|
set autocommit=0;
|
|
SELECT * from t1 where id = 0 FOR UPDATE;
|
|
|
|
connection con2;
|
|
set autocommit=0;
|
|
|
|
# The following statement should hang because con1 is locking the page
|
|
--send
|
|
lock table t1 write;
|
|
--sleep 2
|
|
|
|
connection con1;
|
|
update t1 set x=1 where id = 0;
|
|
select * from t1;
|
|
commit;
|
|
|
|
connection con2;
|
|
reap;
|
|
update t1 set x=2 where id = 0;
|
|
commit;
|
|
unlock tables;
|
|
|
|
connection con1;
|
|
select * from t1;
|
|
commit;
|
|
|
|
drop table t1;
|
|
|
|
--echo #
|
|
--echo # Old lock method (where LOCK TABLE was ignored by InnoDB) no longer
|
|
--echo # works when LOCK TABLE ... WRITE is used due to fix for bugs #46272
|
|
--echo # "MySQL 5.4.4, new MDL: unnecessary and bug #37346 "innodb does not
|
|
--echo # detect deadlock between update and alter table". But it still works
|
|
--echo # for LOCK TABLE ... READ.
|
|
--echo #
|
|
|
|
set @@innodb_table_locks=0;
|
|
|
|
create table t1 (id integer primary key, x integer) engine=INNODB;
|
|
insert into t1 values(0, 0),(1,1),(2,2);
|
|
commit;
|
|
SELECT * from t1 where id = 0 FOR UPDATE;
|
|
|
|
--echo # Connection 'con2'.
|
|
connection con2;
|
|
set autocommit=0;
|
|
set @@innodb_table_locks=0;
|
|
|
|
--echo # The following statement should block because SQL-level lock
|
|
--echo # is taken on t1 which will wait until concurrent transaction
|
|
--echo # is commited.
|
|
--echo # Sending:
|
|
--send lock table t1 write;
|
|
|
|
--echo # Connection 'con1'.
|
|
connection con1;
|
|
--echo # Wait until LOCK TABLE is blocked on SQL-level lock.
|
|
let $wait_condition=
|
|
select count(*) = 1 from information_schema.processlist
|
|
where state = "Waiting for table metadata lock" and
|
|
info = "lock table t1 write";
|
|
--source include/wait_condition.inc
|
|
--echo # We should be able to do UPDATEs and SELECTs within transaction.
|
|
update t1 set x=1 where id = 0;
|
|
select * from t1;
|
|
--echo # Unblock LOCK TABLE.
|
|
commit;
|
|
|
|
--echo # Connection 'con2'.
|
|
connection con2;
|
|
--echo # Reap LOCK TABLE.
|
|
--reap
|
|
unlock tables;
|
|
|
|
--echo # Connection 'con1'.
|
|
connection con1;
|
|
|
|
select * from t1 where id = 0 for update;
|
|
|
|
--echo # Connection 'con2'.
|
|
connection con2;
|
|
--echo # The below statement should not be blocked as LOCK TABLES ... READ
|
|
--echo # does not take strong SQL-level lock on t1. SELECTs which do not
|
|
--echo # conflict with transaction in the first connections should not be
|
|
--echo # blocked.
|
|
lock table t1 read;
|
|
select * from t1;
|
|
select * from t1 where id = 1 lock in share mode;
|
|
unlock tables;
|
|
select * from t1;
|
|
commit;
|
|
|
|
--echo # Connection 'con1'.
|
|
connection con1;
|
|
commit;
|
|
|
|
drop table t1;
|
|
|
|
# End of 4.1 tests
|
|
|
|
--echo #
|
|
--echo #Bug#12842206 INNODB LOCKING REGRESSION FOR INSERT IGNORE
|
|
--echo #fixed by re-fixing Bug#7975
|
|
--echo #aka Bug#11759688 52020: InnoDB can still deadlock on just INSERT...
|
|
--echo #
|
|
|
|
connection default;
|
|
CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL) ENGINE=InnoDB;
|
|
|
|
INSERT INTO t1 VALUES(3,1);
|
|
|
|
BEGIN;
|
|
# this used to wrongly acquire an X lock; now it takes an S lock
|
|
INSERT IGNORE INTO t1 VALUES(3,14);
|
|
|
|
connection con1;
|
|
BEGIN;
|
|
# this used to wrongly acquire an X lock; now it takes an S lock
|
|
INSERT IGNORE INTO t1 VALUES(3,23);
|
|
--send
|
|
SELECT * FROM t1 FOR UPDATE;
|
|
|
|
connection con2;
|
|
# Check that the above SELECT is blocked
|
|
let $wait_condition=
|
|
select count(*) = 1 from information_schema.processlist
|
|
where state = 'Sending data' and
|
|
info = 'SELECT * FROM t1 FOR UPDATE';
|
|
--source include/wait_condition.inc
|
|
|
|
connection default;
|
|
COMMIT;
|
|
connection con1;
|
|
reap;
|
|
COMMIT;
|
|
disconnect con1;
|
|
disconnect con2;
|
|
|
|
connection default;
|
|
DROP TABLE t1;
|