diff options
author | Sergei Petrunia <psergey@askmonty.org> | 2017-07-28 17:52:07 +0000 |
---|---|---|
committer | Sergei Petrunia <psergey@askmonty.org> | 2017-07-28 17:52:07 +0000 |
commit | 43d5edf97c5f9e86173816c1837a1d01267c5165 (patch) | |
tree | f388d2db30a2045cbe5e9132e11e5600a17fff22 /storage/rocksdb/mysql-test/rocksdb/r/write_sync.result | |
parent | 65d01da29c03c44f3c059a999c7c1cc6e001ead8 (diff) | |
download | mariadb-git-43d5edf97c5f9e86173816c1837a1d01267c5165.tar.gz |
Copy of
commit 394d0712d3d46a87a8063e14e998e9c22336e3a6
Author: Anca Agape <anca@fb.com>
Date: Thu Jul 27 15:43:07 2017 -0700
Fix rpl.rpl_4threads_deadlock test broken by D5005670
Summary:
In D5005670 in fill_fields_processlist() function we introduced a point
where we were trying to take the LOCK_thd_data before the
synchronization point used by test
processlist_after_LOCK_thd_count_before_LOCK_thd_data. This was
happening in get_attached_srv_session() function called. Replaced this
with get_attached_srv_session_safe() and moved it after lock is aquired.
Reviewed By: tianx
Differential Revision: D5505992
fbshipit-source-id: bc53924
Diffstat (limited to 'storage/rocksdb/mysql-test/rocksdb/r/write_sync.result')
-rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/r/write_sync.result | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/write_sync.result b/storage/rocksdb/mysql-test/rocksdb/r/write_sync.result index 6ba50a3796f..9eed611a970 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/write_sync.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/write_sync.result @@ -1,7 +1,8 @@ SET GLOBAL rocksdb_write_disable_wal=false; SET GLOBAL rocksdb_write_ignore_missing_column_families=true; create table aaa (id int primary key, i int) engine rocksdb; -SET LOCAL rocksdb_flush_log_at_trx_commit=0; +set @save_rocksdb_flush_log_at_trx_commit=@@global.rocksdb_flush_log_at_trx_commit; +SET GLOBAL rocksdb_flush_log_at_trx_commit=0; select variable_value into @a from information_schema.global_status where variable_name='rocksdb_wal_synced'; insert aaa(id, i) values(1,1); select variable_value-@a from information_schema.global_status where variable_name='rocksdb_wal_synced'; @@ -15,7 +16,7 @@ insert aaa(id, i) values(3,1); select variable_value-@a from information_schema.global_status where variable_name='rocksdb_wal_synced'; variable_value-@a 0 -SET LOCAL rocksdb_flush_log_at_trx_commit=1; +SET GLOBAL rocksdb_flush_log_at_trx_commit=1; insert aaa(id, i) values(4,1); select variable_value-@a from information_schema.global_status where variable_name='rocksdb_wal_synced'; variable_value-@a @@ -28,12 +29,10 @@ insert aaa(id, i) values(6,1); select variable_value-@a from information_schema.global_status where variable_name='rocksdb_wal_synced'; variable_value-@a 3 -SET GLOBAL rocksdb_background_sync=on; -SET LOCAL rocksdb_flush_log_at_trx_commit=0; +SET GLOBAL rocksdb_flush_log_at_trx_commit=2; insert aaa(id, i) values(7,1); truncate table aaa; drop table aaa; -SET GLOBAL rocksdb_flush_log_at_trx_commit=1; +set @@global.rocksdb_flush_log_at_trx_commit=@save_rocksdb_flush_log_at_trx_commit; SET GLOBAL rocksdb_write_disable_wal=false; SET GLOBAL rocksdb_write_ignore_missing_column_families=false; -SET GLOBAL rocksdb_background_sync=off; |