diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2018-04-11 18:39:06 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2018-04-11 18:39:06 +0300 |
| commit | 5715177a76e61a7fbf2be920786055704544592f (patch) | |
| tree | eb2d9eb66591b88c81202ed6afff954e1b016c66 /storage/rocksdb | |
| parent | 7e700bd2a81ae4b37145f1c32bb0902c72856d2d (diff) | |
| download | mariadb-git-5715177a76e61a7fbf2be920786055704544592f.tar.gz | |
- Fix a merge error
- Test result updates
Diffstat (limited to 'storage/rocksdb')
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result | 1 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/bulk_load_unsorted.test | 1 |
2 files changed, 1 insertions, 1 deletions
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 9a7c2560819..2adaba1e228 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 f4d850d78b4..2abeae343c9 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; |