MariaRocks: post-merge fixes: trivial updates to a few test results

MariaDB · Mar 12, 2017 · d49bbf1 · d49bbf1
1 parent 5b30c78
commit d49bbf1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_cardinality.result b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_cardinality.result
@@ -3,8 +3,10 @@ CREATE TABLE t1 (i INT PRIMARY KEY, j INT) ENGINE = ROCKSDB;
 INSERT INTO t1 VALUES (1,2), (2,4), (3,6), (4,8), (5,10);
 SET debug_sync= 'rocksdb.commit_in_place_alter_table WAIT_FOR flushed';
 ALTER TABLE t1 ADD INDEX kj(j), ALGORITHM=INPLACE;
+connect  con1,localhost,root,,;
 SET GLOBAL rocksdb_force_flush_memtable_now = 1;
 SET debug_sync= 'now SIGNAL flushed';
+connection default;
 SELECT * FROM INFORMATION_SCHEMA.ROCKSDB_INDEX_FILE_MAP
 WHERE INDEX_NUMBER =
 (SELECT INDEX_NUMBER FROM INFORMATION_SCHEMA.ROCKSDB_DDL
@@ -17,5 +19,6 @@ WHERE INDEX_NUMBER =
 WHERE TABLE_NAME = 't1' AND INDEX_NAME = "kj");
 COLUMN_FAMILY	INDEX_NUMBER	SST_NAME	NUM_ROWS	DATA_SIZE	ENTRY_DELETES	ENTRY_SINGLEDELETES	ENTRY_MERGES	ENTRY_OTHERS	DISTINCT_KEYS_PREFIX
 #	#	SSTNAME	5	#	#	#	#	#	5,5
+disconnect con1;
 SET debug_sync='RESET';
 DROP TABLE t1;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load.result
@@ -3,6 +3,7 @@ CREATE TABLE t1(pk CHAR(5) PRIMARY KEY, a char(30), b char(30), key(a)) COLLATE
 CREATE TABLE t2(pk CHAR(5) PRIMARY KEY, a char(30), b char(30), key(a)) COLLATE 'latin1_bin';
 CREATE TABLE t3(pk CHAR(5) PRIMARY KEY, a char(30), b char(30), 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
@@ -11,6 +12,7 @@ start transaction with consistent snapshot;
 select * from information_schema.rocksdb_dbstats where stat_type='DB_NUM_SNAPSHOTS';
 STAT_TYPE	VALUE
 DB_NUM_SNAPSHOTS	1
+connection default;
 set rocksdb_bulk_load=1;
 set rocksdb_bulk_load_size=100000;
 LOAD DATA INFILE <input_file> INTO TABLE t1;
@@ -61,4 +63,5 @@ count(b)
 5000000
 longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp
 test.bulk_load.tmp
+disconnect other;
 DROP TABLE t1, t2, t3;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/unique_check.result b/storage/rocksdb/mysql-test/rocksdb/r/unique_check.result
@@ -102,6 +102,7 @@ disconnect con1;
 disconnect con2;
 disconnect con3;
 drop table t1, t2;
+connection default;
 drop table if exists t1,t2,t3;
 create table t1 (id int, value int, primary key (id)) engine=rocksdb;
 create table t2 (id int, id2 int, value int, primary key (id), unique key (id2)) engine=rocksdb;

diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_cf_per_partition.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_cf_per_partition.test
@@ -1,5 +1,7 @@
 --source include/have_rocksdb.inc
 
+--source include/have_partition.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;