Updated rocksdb test result

This was required as I added a new error code to my_base.h and rocksdb
is adding it's own errors after the last official one

Updated result file also for index_merge_rocksdb2. This is a big test
and we have probably not before noticed that some optimizer changes
caused a difference.

3 files changed, 21 insertions, 21 deletions

diff --git a/storage/rocksdb/mysql-test/rocksdb/r/corrupted_data_reads_debug.result b/storage/rocksdb/mysql-test/rocksdb/r/corrupted_data_reads_debug.result
index 47f7bb923ba..01fa9dac7fd 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/corrupted_data_reads_debug.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/corrupted_data_reads_debug.result
@@ -20,7 +20,7 @@ set @tmp1=@@rocksdb_verify_row_debug_checksums;
 set rocksdb_verify_row_debug_checksums=1;
 set session debug_dbug= "+d,myrocks_simulate_bad_row_read1";
 select * from t1 where pk=1;
-ERROR HY000: Got error 202 'Found data corruption.' from ROCKSDB
+ERROR HY000: Got error 203 'Found data corruption.' from ROCKSDB
 set session debug_dbug= "-d,myrocks_simulate_bad_row_read1";
 set rocksdb_verify_row_debug_checksums=@tmp1;
 select * from t1 where pk=1;
@@ -28,11 +28,11 @@ pk	col1
 1	1
 set session debug_dbug= "+d,myrocks_simulate_bad_row_read2";
 select * from t1 where pk=1;
-ERROR HY000: Got error 202 'Found data corruption.' from ROCKSDB
+ERROR HY000: Got error 203 'Found data corruption.' from ROCKSDB
 set session debug_dbug= "-d,myrocks_simulate_bad_row_read2";
 set session debug_dbug= "+d,myrocks_simulate_bad_row_read3";
 select * from t1 where pk=1;
-ERROR HY000: Got error 202 'Found data corruption.' from ROCKSDB
+ERROR HY000: Got error 203 'Found data corruption.' from ROCKSDB
 set session debug_dbug= "-d,myrocks_simulate_bad_row_read3";
 insert into t1 values(4,'0123456789');
 select * from t1;
@@ -56,7 +56,7 @@ pk	col1
 ABCD	1
 set session debug_dbug= "+d,myrocks_simulate_bad_pk_read1";
 select * from t2;
-ERROR HY000: Got error 202 'Found data corruption.' from ROCKSDB
+ERROR HY000: Got error 203 'Found data corruption.' from ROCKSDB
 set session debug_dbug= "-d,myrocks_simulate_bad_pk_read1";
 drop table t2;
 create table t2 (
@@ -69,6 +69,6 @@ pk	col1
 ABCD	1
 set session debug_dbug= "+d,myrocks_simulate_bad_pk_read1";
 select * from t2;
-ERROR HY000: Got error 202 'Found data corruption.' from ROCKSDB
+ERROR HY000: Got error 203 'Found data corruption.' from ROCKSDB
 set session debug_dbug= "-d,myrocks_simulate_bad_pk_read1";
 drop table t2;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/index_merge_rocksdb2.result b/storage/rocksdb/mysql-test/rocksdb/r/index_merge_rocksdb2.result
index d96c40127a8..9de77014593 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/index_merge_rocksdb2.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/index_merge_rocksdb2.result
@@ -63,7 +63,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1	NULL	NULL	NULL	#	Using where
 explain select * from t0 where (key1 < 3 or key2 <4) and key3 = 50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t0	index_merge	i1,i2,i3	i1,i2	4,4	NULL	#	Using sort_union(i1,i2); Using where
+1	SIMPLE	t0	ref	i1,i2,i3	i3	4	const	#	Using where
 explain select * from t0 use index (i1,i2) where (key1 < 2 or key2 <3) and key3 = 50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	index_merge	i1,i2	i1,i2	4,4	NULL	#	Using sort_union(i1,i2); Using where
@@ -121,11 +121,11 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 explain select * from t0 where
 (key1 < 3 or key2 < 3) and (key3 < 70);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t0	index_merge	i1,i2,i3	i1,i2	4,4	NULL	#	Using sort_union(i1,i2); Using where
+1	SIMPLE	t0	range	i1,i2,i3	i3	4	NULL	#	Using index condition; Using where
 explain select * from t0 where
 (key1 < 3 or key2 < 3) and (key3 < 1000);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t0	index_merge	i1,i2,i3	i1,i2	4,4	NULL	#	Using sort_union(i1,i2); Using where
+1	SIMPLE	t0	range	i1,i2,i3	i3	4	NULL	#	Using index condition; Using where
 explain select * from t0 where
 ((key1 < 3 or key2 < 3) and (key2 <4 or key3 < 3))
 or
@@ -287,7 +287,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	
 explain select * from (select * from t1 where key1 = 3 or key2 =3) as Z where key8 >5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index_merge	i1,i2,i8	i1,i2	4,4	NULL	4	Using union(i1,i2); Using where
+1	SIMPLE	t1	range	i1,i2,i8	i8	4	NULL	2	Using index condition; Using where
 create table t3 like t0;
 insert into t3 select * from t0;
 alter table t3 add key9 int not null, add index i9(key9);
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 95dae68b4e6..90f163b7d4b 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,16 +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: Can't create table `test`.`t1` (errno: 198 "Unknown error 198")
+ERROR HY000: Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
 show warnings;
 Level	Code	Message
-Error	1005	Can't create table `test`.`t1` (errno: 198 "Unknown error 198")
-Warning	1296	Got error 198 'Specifying DATA DIRECTORY for an individual table is not supported.' from ROCKSDB
+Error	1005	Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
+Warning	1296	Got error 199 'Specifying DATA DIRECTORY for an individual table is not supported.' from ROCKSDB
 CREATE TABLE t1 (a INT PRIMARY KEY, b CHAR(8)) ENGINE=rocksdb INDEX DIRECTORY = '/foo/bar/index';
-ERROR HY000: Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
+ERROR HY000: Can't create table `test`.`t1` (errno: 200 "Unknown error 200")
 show warnings;
 Level	Code	Message
-Error	1005	Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
-Warning	1296	Got error 199 'Specifying INDEX DIRECTORY for an individual table is not supported.' from ROCKSDB
+Error	1005	Can't create table `test`.`t1` (errno: 200 "Unknown error 200")
+Warning	1296	Got error 200 'Specifying INDEX DIRECTORY for an individual table is not supported.' from ROCKSDB
 CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY) ENGINE=rocksdb PARTITION BY RANGE (id)
 (
 PARTITION P0 VALUES LESS THAN (1000)
@@ -19,11 +19,11 @@ PARTITION P1 VALUES LESS THAN (2000)
 DATA DIRECTORY =  '/foo/bar/data/',
 PARTITION P2 VALUES LESS THAN (MAXVALUE)
 );
-ERROR HY000: Can't create table `test`.`t1` (errno: 198 "Unknown error 198")
+ERROR HY000: Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
 show warnings;
 Level	Code	Message
-Error	1005	Can't create table `test`.`t1` (errno: 198 "Unknown error 198")
-Warning	1296	Got error 198 'Specifying DATA DIRECTORY for an individual table is not supported.' from ROCKSDB
+Error	1005	Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
+Warning	1296	Got error 199 '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)
 (
@@ -33,9 +33,9 @@ PARTITION P1 VALUES LESS THAN (2000)
 INDEX DIRECTORY =  '/foo/bar/data/',
 PARTITION P2 VALUES LESS THAN (MAXVALUE)
 );
-ERROR HY000: Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
+ERROR HY000: Can't create table `test`.`t1` (errno: 200 "Unknown error 200")
 show warnings;
 Level	Code	Message
-Error	1005	Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
-Warning	1296	Got error 199 'Specifying INDEX DIRECTORY for an individual table is not supported.' from ROCKSDB
+Error	1005	Can't create table `test`.`t1` (errno: 200 "Unknown error 200")
+Warning	1296	Got error 200 '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")