diff options
Diffstat (limited to 'mysql-test/main/concurrent_innodb_safelog.result')
| -rw-r--r-- | mysql-test/main/concurrent_innodb_safelog.result | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/mysql-test/main/concurrent_innodb_safelog.result b/mysql-test/main/concurrent_innodb_safelog.result index 27889777ac1..7d120547570 100644 --- a/mysql-test/main/concurrent_innodb_safelog.result +++ b/mysql-test/main/concurrent_innodb_safelog.result @@ -1,15 +1,13 @@ +SET @save_timeout = @@GLOBAL.innodb_lock_wait_timeout; +SET GLOBAL innodb_lock_wait_timeout = 1; SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ; connection default; SET SQL_MODE=""; SELECT @@global.tx_isolation; @@global.tx_isolation REPEATABLE-READ -SELECT @@global.innodb_locks_unsafe_for_binlog; -@@global.innodb_locks_unsafe_for_binlog -0 # keep_locks == 1 GRANT USAGE ON test.* TO mysqltest@localhost; -drop table if exists t1; ** ** two UPDATE's running and both changing distinct result sets @@ -17,7 +15,7 @@ drop table if exists t1; connect thread1, localhost, mysqltest,,; connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -47,7 +45,7 @@ begin; ** Update on t1 will cause a table scan which will be blocked because ** the previously initiated table scan applied exclusive key locks on ** all primary keys. -** Not so if innodb_locks_unsafe_for_binlog is set. The locks that +** Not so for READ UNCOMMITTED or READ COMMITTED. The locks that ** do not match the WHERE condition are released. update t1 set eta=2 where tipo=22; ERROR HY000: Lock wait timeout exceeded; try restarting transaction @@ -157,7 +155,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -187,7 +185,7 @@ begin; ** Update on t1 will cause a table scan which will be blocked because ** the previously initiated table scan applied exclusive key locks on ** all primary keys. -** Not so if innodb_locks_unsafe_for_binlog is set. The locks that +** Not so for READ UNCOMMITTED or READ COMMITTED. The locks that ** do not match the WHERE condition are released. update t1 set tipo=1 where tipo=2; ERROR HY000: Lock wait timeout exceeded; try restarting transaction @@ -295,7 +293,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1 (a int not null, b int not null); insert into t1 values (1,1),(2,1),(3,1),(4,1); ** Create ULL 'hello2' @@ -344,7 +342,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -447,7 +445,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -476,7 +474,7 @@ begin; ** Updating single row using a table scan. This will time out ** because of ongoing transaction on thread 1 holding lock on ** all primary keys in the scan. -** Not so if innodb_locks_unsafe_for_binlog is set. The locks that +** Not so for READ UNCOMMITTED or READ COMMITTED. The locks that ** do not match the WHERE condition are released. update t1 set tipo=11 where tipo=22; ERROR HY000: Lock wait timeout exceeded; try restarting transaction @@ -551,7 +549,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -638,7 +636,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -715,7 +713,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -736,7 +734,7 @@ begin; ** Update on t1 will cause a table scan which will be blocked because ** the previously initiated table scan applied exclusive key locks on ** all primary keys. -** Not so if innodb_locks_unsafe_for_binlog is set. The locks that +** Not so for READ UNCOMMITTED or READ COMMITTED. The locks that ** do not match the WHERE condition are released. update t1 set tipo=1 where tipo=22; ERROR HY000: Lock wait timeout exceeded; try restarting transaction @@ -789,12 +787,10 @@ eta tipo c 70 1 iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii 80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj 90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk -** Cleanup -connection thread1; disconnect thread1; -connection thread2; disconnect thread2; connection default; drop table t1; drop user mysqltest@localhost; SET SQL_MODE=default; +SET GLOBAL innodb_lock_wait_timeout = @save_timeout; |