diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-22 14:49:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-23 10:25:12 +0300 |
| commit | 1a6f470464171bd1144e4dd6f169bb4018f2e81a (patch) | |
| tree | 1e400c7e969dd07f4b60fdba504ff1c6545ff6bc /mysql-test/main/concurrent_innodb_safelog.test | |
| parent | 47cede646b8f24b8dddc5bbb19b8e2b250858214 (diff) | |
| download | mariadb-git-1a6f470464171bd1144e4dd6f169bb4018f2e81a.tar.gz | |
MDEV-19544 Remove innodb_locks_unsafe_for_binlog
The transaction isolation levels READ COMMITTED and READ UNCOMMITTED
should behave similarly to the old deprecated setting
innodb_locks_unsafe_for_binlog=1, that is, avoid acquiring gap locks.
row_search_mvcc(): Reduce the scope of some variables, and clean up
the initialization and use of the variable set_also_gap_locks.
Diffstat (limited to 'mysql-test/main/concurrent_innodb_safelog.test')
| -rw-r--r-- | mysql-test/main/concurrent_innodb_safelog.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/main/concurrent_innodb_safelog.test b/mysql-test/main/concurrent_innodb_safelog.test index 828df9ef717..7f6b3c328f2 100644 --- a/mysql-test/main/concurrent_innodb_safelog.test +++ b/mysql-test/main/concurrent_innodb_safelog.test @@ -16,8 +16,10 @@ let $engine_type= InnoDB; +SET @save_timeout = @@GLOBAL.innodb_lock_wait_timeout; +SET GLOBAL innodb_lock_wait_timeout = 1; SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ; -# innodb_locks_unsafe_for_binlog not set for this test --source include/concurrent.inc +SET GLOBAL innodb_lock_wait_timeout = @save_timeout; |