MyRocks: post-merge fixes part #8: make rocksdb.validate_datadic test pass

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

@@ -2,7 +2,8 @@ call mtr.add_suppression('RocksDB: Schema mismatch');
 CREATE TABLE t1 (pk int primary key) ENGINE=ROCKSDB;
 CREATE TABLE t2 (pk int primary key) ENGINE=ROCKSDB PARTITION BY KEY(pk) PARTITIONS 4;
 "Expect errors that we are missing two .frm files"
-FOUND 2 /Schema mismatch/ in mysqld.1.err
+FOUND 1 /RocksDB: Schema mismatch - Table test.t1 is registered in RocksDB but does not have a .frm file/ in validate_datadic.err
+FOUND 1 /RocksDB: Schema mismatch - Table test.t2 is registered in RocksDB but does not have a .frm file/ in validate_datadic.err
 "Expect an error that we have an extra .frm file"
-FOUND 3 /Schema mismatch/ in mysqld.1.err
+FOUND 1 /Schema mismatch - A .frm file exists for table test.t1_dummy, but that table is not registered in RocksDB/ in validate_datadic.err
 DROP TABLE t1, t2;

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

@@ -57,8 +57,13 @@ shutdown_server 10;
 
 # We should now have an error message
 --echo "Expect errors that we are missing two .frm files"
---let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
---let SEARCH_PATTERN=Schema mismatch
+#--let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
+#--let SEARCH_PATTERN=Schema mismatch
+#--source include/search_pattern_in_file.inc
+#--let SEARCH_PATTERN=RocksDB: Schema mismatch - Table test.t2 is registered in RocksDB but does not have a .frm file
+#--source include/search_pattern_in_file.inc
+--let SEARCH_FILE=$LOG
+--let SEARCH_PATTERN=RocksDB: Schema mismatch - Table test.t1 is registered in RocksDB but does not have a .frm file
 --source include/search_pattern_in_file.inc
 --let SEARCH_PATTERN=RocksDB: Schema mismatch - Table test.t2 is registered in RocksDB but does not have a .frm file
 --source include/search_pattern_in_file.inc