revision-id: 5715177a76e61a7fbf2be920786055704544592f parent(s): 7e700bd2a81ae4b37145f1c32bb0902c72856d2d committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-11 18:39:06 +0300 message: - Fix a merge error - Test result updates --- storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result | 1 + storage/rocksdb/mysql-test/rocksdb/t/bulk_load_unsorted.test | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result index 9a7c256..2adaba1 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result @@ -116,4 +116,5 @@ a b 4999999 -4999997 4999997 -4999995 4999995 -4999993 +disconnect other; DROP TABLE t1, t2, t3; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_unsorted.test b/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_unsorted.test index f4d850d..2abeae3 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_unsorted.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_unsorted.test @@ -4,4 +4,3 @@ --let pk_cf=cf1 --source ../include/bulk_load_unsorted.inc -binmode $fh;