More post-merge fixes

Author: spetrunia

storage/rocksdb/mysql-test/rocksdb/r/bulk_load_drop_table.result

@@ -2,7 +2,10 @@ CREATE TABLE t1 (pk INT, PRIMARY KEY (pk)) ENGINE=ROCKSDB;
 SET rocksdb_bulk_load_allow_unsorted=1;
 SET rocksdb_bulk_load=1;
 INSERT INTO t1 VALUES (1);
+connect  con1,localhost,root,,;
 DROP TABLE t1;
+connection default;
+disconnect con1;
 SET rocksdb_bulk_load=0;
 SELECT * FROM t1;
 ERROR 42S02: Table 'test.t1' doesn't exist

storage/rocksdb/mysql-test/rocksdb/r/cardinality.result

@@ -33,6 +33,7 @@ information_schema.statistics where table_name="t0" and column_name="a";
 FLOOR(@N/cardinality)
 2
 drop table t0;
+DROP TABLE IF EXISTS t1,t10,t11;
 create table t1(
 id bigint not null primary key, 
 i1 bigint, #unique