diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2018-01-31 14:31:44 +0000 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2018-01-31 14:31:44 +0000 |
| commit | ba03577a1f141eec2e63ea5df16c04168791fe6b (patch) | |
| tree | 130c99ddcc7f6eb9048b97c6684d33a7af2a17d4 /storage | |
| parent | 669e910a6a9522495574cd3cc8b3925e56b78ec8 (diff) | |
| download | mariadb-git-ba03577a1f141eec2e63ea5df16c04168791fe6b.tar.gz | |
Post-merge fixes: make rocksdb.bulk_load_unsorted_rev to work.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc | 1 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc b/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc index 84a9d8c578e..4a3158e814c 100644 --- a/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc +++ b/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc @@ -1,3 +1,4 @@ +--source include/have_partition.inc --source include/count_sessions.inc SET rocksdb_bulk_load_size=3; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result index fcd05fd60b4..f828fa57255 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result @@ -57,6 +57,7 @@ CREATE TABLE t2(a INT, b INT, PRIMARY KEY(b) COMMENT "rev:cf1") ENGINE=ROCKSDB; CREATE TABLE t3(a INT, b INT, PRIMARY KEY(a) COMMENT "rev:cf1") ENGINE=ROCKSDB PARTITION BY KEY() PARTITIONS 4; +connect other,localhost,root,,; set session transaction isolation level repeatable read; select * from information_schema.rocksdb_dbstats where stat_type='DB_NUM_SNAPSHOTS'; STAT_TYPE VALUE @@ -65,6 +66,7 @@ start transaction with consistent snapshot; select * from information_schema.rocksdb_dbstats where stat_type='DB_NUM_SNAPSHOTS'; STAT_TYPE VALUE DB_NUM_SNAPSHOTS 1 +connection default; set rocksdb_bulk_load=1; set rocksdb_bulk_load_size=100000; LOAD DATA INFILE <input_file> INTO TABLE t1; @@ -114,4 +116,5 @@ a b -4999998 5000000 -4999996 4999998 -4999994 4999996 +disconnect other; DROP TABLE t1, t2, t3; |