Post-merge fixes: fix rocksdb.tbl_opt_data_index_dir

MariaDB generates both errors and warnings. Warnings are not normally
visible when errors are also produced.

2 files changed, 18 insertions, 11 deletions

diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result
index 1f5871ee0d3..dcb66a2ab23 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result
@@ -1,19 +1,16 @@
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (a INT PRIMARY KEY, b CHAR(8)) ENGINE=rocksdb DATA DIRECTORY = '/foo/bar/data';
-ERROR HY000: Got error 196 'Specifying DATA DIRECTORY for an individual table is not supported.' from ROCKSDB
+ERROR HY000: Can't create table `test`.`t1` (errno: 196 "Unknown error 196")
 show warnings;
 Level	Code	Message
+Error	1005	Can't create table `test`.`t1` (errno: 196 "Unknown error 196")
 Warning	1296	Got error 196 'Specifying DATA DIRECTORY for an individual table is not supported.' from ROCKSDB
-Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
-Warning	1030	Got error 140 "Wrong create options" from storage engine ROCKSDB
 CREATE TABLE t1 (a INT PRIMARY KEY, b CHAR(8)) ENGINE=rocksdb INDEX DIRECTORY = '/foo/bar/index';
-ERROR HY000: Got error 197 'Specifying INDEX DIRECTORY for an individual table is not supported.' from ROCKSDB
-ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 197 "Unknown error 197")
 show warnings;
 Level	Code	Message
+Error	1005	Can't create table `test`.`t1` (errno: 197 "Unknown error 197")
 Warning	1296	Got error 197 'Specifying INDEX DIRECTORY for an individual table is not supported.' from ROCKSDB
-Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
-Warning	1030	Got error 140 "Wrong create options" from storage engine ROCKSDB
 CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY) ENGINE=rocksdb PARTITION BY RANGE (id)
 (
 PARTITION P0 VALUES LESS THAN (1000)
@@ -22,8 +19,12 @@ PARTITION P1 VALUES LESS THAN (2000)
 DATA DIRECTORY =  '/foo/bar/data/',
 PARTITION P2 VALUES LESS THAN (MAXVALUE)
 );
-ERROR HY000: Got error 196 'Specifying DATA DIRECTORY for an individual table is not supported.' from ROCKSDB
-ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 196 "Unknown error 196")
+show warnings;
+Level	Code	Message
+Error	1005	Can't create table `test`.`t1` (errno: 196 "Unknown error 196")
+Warning	1296	Got error 196 'Specifying DATA DIRECTORY for an individual table is not supported.' from ROCKSDB
+Error	6	Error on delete of './test/t1.par' (Errcode: 2 "No such file or directory")
 CREATE TABLE t1 (id int not null primary key) ENGINE=rocksdb PARTITION BY RANGE (id)
 (
 PARTITION P0 VALUES LESS THAN (1000)
@@ -32,5 +33,9 @@ PARTITION P1 VALUES LESS THAN (2000)
 INDEX DIRECTORY =  '/foo/bar/data/',
 PARTITION P2 VALUES LESS THAN (MAXVALUE)
 );
-ERROR HY000: Got error 197 'Specifying INDEX DIRECTORY for an individual table is not supported.' from ROCKSDB
-ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 197 "Unknown error 197")
+show warnings;
+Level	Code	Message
+Error	1005	Can't create table `test`.`t1` (errno: 197 "Unknown error 197")
+Warning	1296	Got error 197 'Specifying INDEX DIRECTORY for an individual table is not supported.' from ROCKSDB
+Error	6	Error on delete of './test/t1.par' (Errcode: 2 "No such file or directory")
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/tbl_opt_data_index_dir.test b/storage/rocksdb/mysql-test/rocksdb/t/tbl_opt_data_index_dir.test
index 99cb2253d94..a7be5c9a7ac 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/tbl_opt_data_index_dir.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/tbl_opt_data_index_dir.test
@@ -34,6 +34,7 @@ CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY) ENGINE=rocksdb PARTITION BY RANGE
         DATA DIRECTORY =  '/foo/bar/data/',
     PARTITION P2 VALUES LESS THAN (MAXVALUE)
 );
+show warnings;
 
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 (id int not null primary key) ENGINE=rocksdb PARTITION BY RANGE (id)
@@ -44,3 +45,4 @@ CREATE TABLE t1 (id int not null primary key) ENGINE=rocksdb PARTITION BY RANGE
        INDEX DIRECTORY =  '/foo/bar/data/',
    PARTITION P2 VALUES LESS THAN (MAXVALUE)
 );
+show warnings;