Skip to content

Commit 65cce29

Browse files
committed
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.
1 parent 0d47945 commit 65cce29

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ set @tmp1=@@rocksdb_verify_row_debug_checksums;
2020
set rocksdb_verify_row_debug_checksums=1;
2121
set session debug_dbug= "+d,myrocks_simulate_bad_row_read1";
2222
select * from t1 where pk=1;
23-
ERROR HY000: Got error 202 'Found data corruption.' from ROCKSDB
23+
ERROR HY000: Got error 203 'Found data corruption.' from ROCKSDB
2424
set session debug_dbug= "-d,myrocks_simulate_bad_row_read1";
2525
set rocksdb_verify_row_debug_checksums=@tmp1;
2626
select * from t1 where pk=1;
2727
pk col1
2828
1 1
2929
set session debug_dbug= "+d,myrocks_simulate_bad_row_read2";
3030
select * from t1 where pk=1;
31-
ERROR HY000: Got error 202 'Found data corruption.' from ROCKSDB
31+
ERROR HY000: Got error 203 'Found data corruption.' from ROCKSDB
3232
set session debug_dbug= "-d,myrocks_simulate_bad_row_read2";
3333
set session debug_dbug= "+d,myrocks_simulate_bad_row_read3";
3434
select * from t1 where pk=1;
35-
ERROR HY000: Got error 202 'Found data corruption.' from ROCKSDB
35+
ERROR HY000: Got error 203 'Found data corruption.' from ROCKSDB
3636
set session debug_dbug= "-d,myrocks_simulate_bad_row_read3";
3737
insert into t1 values(4,'0123456789');
3838
select * from t1;
@@ -56,7 +56,7 @@ pk col1
5656
ABCD 1
5757
set session debug_dbug= "+d,myrocks_simulate_bad_pk_read1";
5858
select * from t2;
59-
ERROR HY000: Got error 202 'Found data corruption.' from ROCKSDB
59+
ERROR HY000: Got error 203 'Found data corruption.' from ROCKSDB
6060
set session debug_dbug= "-d,myrocks_simulate_bad_pk_read1";
6161
drop table t2;
6262
create table t2 (
@@ -69,6 +69,6 @@ pk col1
6969
ABCD 1
7070
set session debug_dbug= "+d,myrocks_simulate_bad_pk_read1";
7171
select * from t2;
72-
ERROR HY000: Got error 202 'Found data corruption.' from ROCKSDB
72+
ERROR HY000: Got error 203 'Found data corruption.' from ROCKSDB
7373
set session debug_dbug= "-d,myrocks_simulate_bad_pk_read1";
7474
drop table t2;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ id select_type table type possible_keys key key_len ref rows Extra
6363
1 SIMPLE t0 ALL i1 NULL NULL NULL # Using where
6464
explain select * from t0 where (key1 < 3 or key2 <4) and key3 = 50;
6565
id select_type table type possible_keys key key_len ref rows Extra
66-
1 SIMPLE t0 index_merge i1,i2,i3 i1,i2 4,4 NULL # Using sort_union(i1,i2); Using where
66+
1 SIMPLE t0 ref i1,i2,i3 i3 4 const # Using where
6767
explain select * from t0 use index (i1,i2) where (key1 < 2 or key2 <3) and key3 = 50;
6868
id select_type table type possible_keys key key_len ref rows Extra
6969
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
121121
explain select * from t0 where
122122
(key1 < 3 or key2 < 3) and (key3 < 70);
123123
id select_type table type possible_keys key key_len ref rows Extra
124-
1 SIMPLE t0 index_merge i1,i2,i3 i1,i2 4,4 NULL # Using sort_union(i1,i2); Using where
124+
1 SIMPLE t0 range i1,i2,i3 i3 4 NULL # Using index condition; Using where
125125
explain select * from t0 where
126126
(key1 < 3 or key2 < 3) and (key3 < 1000);
127127
id select_type table type possible_keys key key_len ref rows Extra
128-
1 SIMPLE t0 index_merge i1,i2,i3 i1,i2 4,4 NULL # Using sort_union(i1,i2); Using where
128+
1 SIMPLE t0 range i1,i2,i3 i3 4 NULL # Using index condition; Using where
129129
explain select * from t0 where
130130
((key1 < 3 or key2 < 3) and (key2 <4 or key3 < 3))
131131
or
@@ -287,7 +287,7 @@ id select_type table type possible_keys key key_len ref rows Extra
287287
NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL
288288
explain select * from (select * from t1 where key1 = 3 or key2 =3) as Z where key8 >5;
289289
id select_type table type possible_keys key key_len ref rows Extra
290-
1 SIMPLE t1 index_merge i1,i2,i8 i1,i2 4,4 NULL 4 Using union(i1,i2); Using where
290+
1 SIMPLE t1 range i1,i2,i8 i8 4 NULL 2 Using index condition; Using where
291291
create table t3 like t0;
292292
insert into t3 select * from t0;
293293
alter table t3 add key9 int not null, add index i9(key9);
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
DROP TABLE IF EXISTS t1;
22
CREATE TABLE t1 (a INT PRIMARY KEY, b CHAR(8)) ENGINE=rocksdb DATA DIRECTORY = '/foo/bar/data';
3-
ERROR HY000: Can't create table `test`.`t1` (errno: 198 "Unknown error 198")
3+
ERROR HY000: Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
44
show warnings;
55
Level Code Message
6-
Error 1005 Can't create table `test`.`t1` (errno: 198 "Unknown error 198")
7-
Warning 1296 Got error 198 'Specifying DATA DIRECTORY for an individual table is not supported.' from ROCKSDB
6+
Error 1005 Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
7+
Warning 1296 Got error 199 'Specifying DATA DIRECTORY for an individual table is not supported.' from ROCKSDB
88
CREATE TABLE t1 (a INT PRIMARY KEY, b CHAR(8)) ENGINE=rocksdb INDEX DIRECTORY = '/foo/bar/index';
9-
ERROR HY000: Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
9+
ERROR HY000: Can't create table `test`.`t1` (errno: 200 "Unknown error 200")
1010
show warnings;
1111
Level Code Message
12-
Error 1005 Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
13-
Warning 1296 Got error 199 'Specifying INDEX DIRECTORY for an individual table is not supported.' from ROCKSDB
12+
Error 1005 Can't create table `test`.`t1` (errno: 200 "Unknown error 200")
13+
Warning 1296 Got error 200 'Specifying INDEX DIRECTORY for an individual table is not supported.' from ROCKSDB
1414
CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY) ENGINE=rocksdb PARTITION BY RANGE (id)
1515
(
1616
PARTITION P0 VALUES LESS THAN (1000)
@@ -19,11 +19,11 @@ PARTITION P1 VALUES LESS THAN (2000)
1919
DATA DIRECTORY = '/foo/bar/data/',
2020
PARTITION P2 VALUES LESS THAN (MAXVALUE)
2121
);
22-
ERROR HY000: Can't create table `test`.`t1` (errno: 198 "Unknown error 198")
22+
ERROR HY000: Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
2323
show warnings;
2424
Level Code Message
25-
Error 1005 Can't create table `test`.`t1` (errno: 198 "Unknown error 198")
26-
Warning 1296 Got error 198 'Specifying DATA DIRECTORY for an individual table is not supported.' from ROCKSDB
25+
Error 1005 Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
26+
Warning 1296 Got error 199 'Specifying DATA DIRECTORY for an individual table is not supported.' from ROCKSDB
2727
Error 6 Error on delete of './test/t1.par' (Errcode: 2 "No such file or directory")
2828
CREATE TABLE t1 (id int not null primary key) ENGINE=rocksdb PARTITION BY RANGE (id)
2929
(
@@ -33,9 +33,9 @@ PARTITION P1 VALUES LESS THAN (2000)
3333
INDEX DIRECTORY = '/foo/bar/data/',
3434
PARTITION P2 VALUES LESS THAN (MAXVALUE)
3535
);
36-
ERROR HY000: Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
36+
ERROR HY000: Can't create table `test`.`t1` (errno: 200 "Unknown error 200")
3737
show warnings;
3838
Level Code Message
39-
Error 1005 Can't create table `test`.`t1` (errno: 199 "Unknown error 199")
40-
Warning 1296 Got error 199 'Specifying INDEX DIRECTORY for an individual table is not supported.' from ROCKSDB
39+
Error 1005 Can't create table `test`.`t1` (errno: 200 "Unknown error 200")
40+
Warning 1296 Got error 200 'Specifying INDEX DIRECTORY for an individual table is not supported.' from ROCKSDB
4141
Error 6 Error on delete of './test/t1.par' (Errcode: 2 "No such file or directory")

0 commit comments

Comments
 (0)