diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-09-18 14:06:01 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-09-18 14:06:01 +0300 |
| commit | ba3209e219370342c0a0c48324d31e8e2611ecde (patch) | |
| tree | 88ed4442b23c6559952a766bc5ca4f53eeb2360c /storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result | |
| parent | 5ccaabe9620bcf9e960ae019d7e27e5998a772bd (diff) | |
| parent | 3fae64b196cfb94ac4084d02c5745285589c6b48 (diff) | |
| download | mariadb-git-ba3209e219370342c0a0c48324d31e8e2611ecde.tar.gz | |
Merge mergetrees/merge-myrocks into bb-10.2-mariarocks-merge
Upstream cset we are merging from:
commit 184a4a2d82f4f6f3cbcb1015bcdb32bebe73315c
Author: Abhinav Sharma <abhinavsharma@fb.com>
Date: Thu Sep 14 11:40:08 2017 -0700
Bump rocksdb submodule
Summary:
Bump rocksdb to include the fix for rocksdb.trx_info_rpl
Lots of conflicts, got the code to compile but tests are likely to
be broken
Diffstat (limited to 'storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result')
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result index 7a7400f17e1..493107ec071 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result @@ -1,4 +1,5 @@ DROP TABLE IF EXISTS t1; +SET GLOBAL MAX_BINLOG_SIZE = 4096; SET GLOBAL ROCKSDB_ENABLE_2PC = ON; create table t1 (a int primary key, b int, c varchar(255)) engine=rocksdb; 'con1' @@ -7,12 +8,10 @@ SET DEBUG_SYNC='rocksdb.prepared SIGNAL parked WAIT_FOR go'; insert into t1 values (1, 1, "iamtheogthealphaandomega");; 'con2' insert into t1 values (2, 1, "i_am_just_here_to_trigger_a_flush"); -SET GLOBAL ROCKSDB_ENABLE_2PC = OFF; -SET GLOBAL ROCKSDB_WRITE_SYNC = OFF; +SET GLOBAL ROCKSDB_FLUSH_LOG_AT_TRX_COMMIT = 0; SET GLOBAL SYNC_BINLOG = 0; SET DEBUG_SYNC='now WAIT_FOR parked'; -SET GLOBAL ROCKSDB_ENABLE_2PC = ON; -SET GLOBAL ROCKSDB_WRITE_SYNC = ON; +SET GLOBAL ROCKSDB_FLUSH_LOG_AT_TRX_COMMIT = 2; SET GLOBAL SYNC_BINLOG = 1; insert into t1 values (1000000, 1, "i_am_just_here_to_trigger_a_flush"); SET DEBUG_SYNC='now SIGNAL go'; @@ -23,5 +22,5 @@ a b c 1 1 iamtheogthealphaandomega select count(*) from t1; count(*) -1000000 +4096 drop table t1; |