Fix rocksdb.bulk_load test

- Remove the merge error
- Update test results

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

@@ -21,6 +21,7 @@ b CHAR(30),
 PRIMARY KEY(pk) COMMENT "cf1",
 KEY(a)
 ) COLLATE 'latin1_bin' PARTITION BY KEY() PARTITIONS 4;
+connect  other,localhost,root,,;
 set session transaction isolation level repeatable read;
 select * from information_schema.rocksdb_dbstats where stat_type='DB_NUM_SNAPSHOTS';
 STAT_TYPE	VALUE

storage/rocksdb/mysql-test/rocksdb/t/bulk_load.test

@@ -8,4 +8,3 @@
 --let data_order_desc=0
 
 --source bulk_load.inc
---remove_file $file