- Fix a merge error

- Test result updates

- Fix a merge error
- Test result updates
5715177a · Sergei Petrunia · 7e700bd2 · 5715177a · 5715177a
Commit 5715177a authored Apr 11, 2018 by Sergei Petrunia
2 changed files
--- 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;
--- 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;