summaryrefslogtreecommitdiff
path: root/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2017-09-15 10:04:49 +0000
committerSergei Petrunia <psergey@askmonty.org>2017-09-15 10:04:49 +0000
commit3fae64b196cfb94ac4084d02c5745285589c6b48 (patch)
treebd96a225ab36cfde9b6f650f5d7d675baf9889f6 /storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result
parent43d5edf97c5f9e86173816c1837a1d01267c5165 (diff)
downloadmariadb-git-3fae64b196cfb94ac4084d02c5745285589c6b48.tar.gz
Copy of
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 The bug was introduced in: https://github.com/facebook/rocksdb/pull/2850 Fixed in: https://github.com/facebook/rocksdb/pull/2881 update-submodule: rocksdb Reviewed By: lth Differential Revision: D5834658 fbshipit-source-id: d1551bf
Diffstat (limited to 'storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result')
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result13
1 files changed, 9 insertions, 4 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result
index f5a2b28ee42..b7b60f26816 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result
@@ -284,12 +284,16 @@ DROP TABLE t1;
set global rocksdb_bulk_load=1;
# Establish connection con1 (user=root)
# Switch to connection con1
-show global variables like 'rocksdb_bulk_load';
+show global variables like 'rocksdb_bulk_load%';
Variable_name Value
rocksdb_bulk_load ON
-show session variables like 'rocksdb_bulk_load';
+rocksdb_bulk_load_allow_unsorted OFF
+rocksdb_bulk_load_size 1000
+show session variables like 'rocksdb_bulk_load%';
Variable_name Value
rocksdb_bulk_load ON
+rocksdb_bulk_load_allow_unsorted OFF
+rocksdb_bulk_load_size 1000
CREATE TABLE t1 (i INT, j INT, PRIMARY KEY (i)) ENGINE = ROCKSDB;
INSERT INTO t1 VALUES (1,1);
# Disconnecting on con1
@@ -327,10 +331,11 @@ SET @prior_rocksdb_strict_collation_check= @@rocksdb_strict_collation_check;
SET @prior_rocksdb_merge_buf_size = @@rocksdb_merge_buf_size;
SET global rocksdb_strict_collation_check = off;
SET session rocksdb_merge_combine_read_size = 566;
-SET session rocksdb_merge_buf_size = 336;
-show variables like '%rocksdb_bulk_load%';
+SET session rocksdb_merge_buf_size = 340;
+show variables like 'rocksdb_bulk_load%';
Variable_name Value
rocksdb_bulk_load OFF
+rocksdb_bulk_load_allow_unsorted OFF
rocksdb_bulk_load_size 1000
CREATE TABLE t1 (a VARCHAR(80)) ENGINE=RocksDB;
INSERT INTO t1 (a) VALUES (REPEAT("a", 80));