Skip to content

Commit

Permalink
Merge branch 'bb-10.2-mariarocks' into bb-10.2-mariarocks-wlad
Browse files Browse the repository at this point in the history
  • Loading branch information
vaintroub committed Apr 1, 2017
2 parents a194390 + 74889de commit 9501c7d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ ALTER TABLE t1 ADD INDEX kb(b) comment 'rev:cf1', ALGORITHM=INPLACE;
SHOW CREATE TABLE t1;
SELECT COUNT(*) FROM t1 FORCE INDEX(kb);
DROP TABLE t1;
--remove_file $file
1 change: 1 addition & 0 deletions storage/rocksdb/mysql-test/rocksdb/t/bulk_load.test
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,4 @@ EOF
# Cleanup
disconnect other;
DROP TABLE t1, t2, t3;
--remove_file $file

0 comments on commit 9501c7d

Please sign in to comment.