Skip to content

Commit 1d1211a

Browse files
spetruniaspetrunia
committed
MariaRocks port: trivial Maria-fication of test results
Updated test results for obvious MariaDB vs MySQL differences
1 parent 9826edb commit 1d1211a

11 files changed

+47
-29
lines changed

‎storage/rocksdb/mysql-test/rocksdb/r/alter_table.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SHOW CREATE TABLE t1;
1616
Table Create Table
1717
t1 CREATE TABLE `t1` (
1818
`pk` int(11) NOT NULL,
19-
`a` int(11) DEFAULT '0',
19+
`a` int(11) DEFAULT 0,
2020
`c` char(8) DEFAULT NULL,
2121
`b` int(11) DEFAULT NULL,
2222
PRIMARY KEY (`pk`)

‎storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ a+0 b+0 c+0 d+0
254254
1 0 18446744073709551615 0
255255
DROP TABLE t1;
256256
CREATE TABLE t1 (pk INT PRIMARY KEY, a BIT(65) NULL) ENGINE=rocksdb;
257-
ERROR 42000: Display width out of range for column 'a' (max = 64)
257+
ERROR 42000: Display width out of range for 'a' (max = 64)
258258
DROP TABLE IF EXISTS t1;
259259
CREATE TABLE t1 (
260260
c BIT NULL,
@@ -340,7 +340,7 @@ LENGTH(b) LENGTH(b0) LENGTH(b1) LENGTH(b300) LENGTH(bm) LENGTH(b70k) LENGTH(b17m
340340
65535 65535 255 65535 65535 1048576 1048576 255 1048576 1048576
341341
65535 65535 255 65535 65535 1048576 2097152 255 1048576 2097152
342342
ALTER TABLE t1 ADD COLUMN bbb BLOB(4294967296);
343-
ERROR 42000: Display width out of range for column 'bbb' (max = 4294967295)
343+
ERROR 42000: Display width out of range for 'bbb' (max = 4294967295)
344344
DROP TABLE t1;
345345
DROP TABLE IF EXISTS t1;
346346
CREATE TABLE t1 (

‎storage/rocksdb/mysql-test/rocksdb/r/col_opt_unsigned.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4
148148
9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999
149149
9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999
150150
ALTER TABLE t1 ADD COLUMN n66 NUMERIC(66) UNSIGNED;
151-
ERROR 42000: Too big precision 66 specified for column 'n66'. Maximum is 65.
151+
ERROR 42000: Too big precision 66 specified for 'n66'. Maximum is 65
152152
ALTER TABLE t1 ADD COLUMN n66_6 DECIMAL(66,6) UNSIGNED;
153-
ERROR 42000: Too big precision 66 specified for column 'n66_6'. Maximum is 65.
153+
ERROR 42000: Too big precision 66 specified for 'n66_6'. Maximum is 65
154154
ALTER TABLE t1 ADD COLUMN n66_66 DECIMAL(66,66) UNSIGNED;
155-
ERROR 42000: Too big scale 66 specified for column 'n66_66'. Maximum is 30.
155+
ERROR 42000: Too big scale 66 specified for 'n66_66'. Maximum is 38
156156
DROP TABLE t1;
157157
CREATE TABLE t1 (
158158
a DECIMAL UNSIGNED,
@@ -709,7 +709,7 @@ i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20
709709
4294967295 4294967295 4294967295 4294967295 255 255 255 255 65535 65535 65535 65535 16777215 16777215 16777215 16777215 18446744073709551615 18446744073709551615 18446744073709551615 18446744073709551615
710710
4294967295 4294967295 4294967295 4294967295 255 255 255 255 65535 65535 65535 65535 16777215 16777215 16777215 16777215 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807
711711
ALTER TABLE t1 ADD COLUMN i257 INT(257) UNSIGNED;
712-
ERROR 42000: Display width out of range for column 'i257' (max = 255)
712+
ERROR 42000: Display width out of range for 'i257' (max = 255)
713713
DROP TABLE t1;
714714
CREATE TABLE t1 (
715715
t TINYINT UNSIGNED,

‎storage/rocksdb/mysql-test/rocksdb/r/col_opt_zerofill.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4
148148
9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999
149149
9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999
150150
ALTER TABLE t1 ADD COLUMN n66 NUMERIC(66) ZEROFILL;
151-
ERROR 42000: Too big precision 66 specified for column 'n66'. Maximum is 65.
151+
ERROR 42000: Too big precision 66 specified for 'n66'. Maximum is 65
152152
ALTER TABLE t1 ADD COLUMN n66_6 DECIMAL(66,6) ZEROFILL;
153-
ERROR 42000: Too big precision 66 specified for column 'n66_6'. Maximum is 65.
153+
ERROR 42000: Too big precision 66 specified for 'n66_6'. Maximum is 65
154154
ALTER TABLE t1 ADD COLUMN n66_66 DECIMAL(66,66) ZEROFILL;
155-
ERROR 42000: Too big scale 66 specified for column 'n66_66'. Maximum is 30.
155+
ERROR 42000: Too big scale 66 specified for 'n66_66'. Maximum is 38
156156
DROP TABLE t1;
157157
CREATE TABLE t1 (
158158
a DECIMAL ZEROFILL,

‎storage/rocksdb/mysql-test/rocksdb/r/misc.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ user(),
2323
'utf8_general_ci',
2424
'select 1');
2525
SHOW EVENTS;
26-
ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'
26+
ERROR 42000: This version of MariaDB doesn't yet support 'MICROSECOND'
2727
DROP EVENT ev1;
2828
SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
2929
FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME;

‎storage/rocksdb/mysql-test/rocksdb/r/rpl_statement.result

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Warnings:
33
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
44
Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
55
[connection master]
6+
connection master;
67
drop table if exists t1;
8+
connection master;
79
select @@binlog_format;
810
@@binlog_format
911
STATEMENT
@@ -24,11 +26,13 @@ ERROR HY000: Can't execute updates on master with binlog_format != ROW.
2426
set binlog_format=row;
2527
insert into t1 values (1),(2),(3);
2628
include/sync_slave_sql_with_master.inc
29+
connection slave;
2730
select * from t1;
2831
pk
2932
1
3033
2
3134
3
35+
connection master;
3236
drop table t1;
3337
create table t1 (id int primary key, value int, value2 int, index(value)) engine=rocksdb;
3438
insert into t1 values (1,1,1);
@@ -40,6 +44,7 @@ update t1 set value2=100 where id=1;
4044
update t1 set value2=200 where id=2;
4145
update t1 set value2=300 where id=3;
4246
include/sync_slave_sql_with_master.inc
47+
connection slave;
4348
select * from t1 where id=1;
4449
id value value2
4550
1 1 100
@@ -49,6 +54,7 @@ id value value2
4954
select * from t1 where id=3;
5055
id value value2
5156
3 1 300
57+
connection master;
5258
drop table t1;
5359
set binlog_format=row;
5460
include/rpl_end.inc

‎storage/rocksdb/mysql-test/rocksdb/r/rpl_statement_not_found.result

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Warnings:
33
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
44
Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
55
[connection master]
6+
connection master;
67
drop table if exists t1;
8+
connection master;
79
create table t0 (a int) engine=myisam;
810
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
911
create table t1(a int) engine=myisam;
@@ -19,34 +21,44 @@ insert into t2 select a,a,a,a from t1;
1921
create table t3 like t2;
2022
insert into t3 select * from t2;
2123
include/sync_slave_sql_with_master.inc
24+
connection slave;
2225
set global debug= 'd,dbug.rocksdb.get_row_by_rowid';
2326
include/stop_slave.inc
2427
include/start_slave.inc
28+
connection master;
2529
update t2 set col1=100 where kp1 between 1 and 3 and mod(kp2,2)=0;
30+
connection slave;
2631
set debug_sync= 'now WAIT_FOR Reached';
2732
set global debug = '';
2833
set sql_log_bin=0;
2934
delete from t2 where pk=2;
3035
delete from t2 where pk=3;
3136
set debug_sync= 'now SIGNAL signal.rocksdb.get_row_by_rowid_let_running';
37+
connection master;
3238
include/sync_slave_sql_with_master.inc
39+
connection slave;
3340
select * from t2 where pk < 5;
3441
pk kp1 kp2 col1
3542
0 0 0 0
3643
1 1 1 1
3744
4 4 4 4
45+
connection slave;
3846
set global debug= 'd,dbug.rocksdb.get_row_by_rowid';
3947
include/stop_slave.inc
4048
include/start_slave.inc
49+
connection master;
4150
update t3 set col1=100 where kp1 between 1 and 4 and mod(kp2,2)=0;
51+
connection slave;
4252
call mtr.add_suppression("Deadlock found when trying to get lock");
4353
set debug_sync= 'now WAIT_FOR Reached';
4454
set global debug = '';
4555
set sql_log_bin=0;
4656
delete from t3 where pk=2;
4757
delete from t3 where pk=3;
4858
set debug_sync= 'now SIGNAL signal.rocksdb.get_row_by_rowid_let_running';
59+
connection master;
4960
include/sync_slave_sql_with_master.inc
61+
connection slave;
5062
select * from t3 where pk < 5;
5163
pk kp1 kp2 col1
5264
0 0 0 0

‎storage/rocksdb/mysql-test/rocksdb/r/type_bit.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ SHOW COLUMNS IN t1;
1010
Field Type Null Key Default Extra
1111
a bit(1) YES NULL
1212
b bit(20) YES NULL
13-
c bit(64) NO PRI b'0'
13+
c bit(64) NO PRI NULL
1414
d bit(1) YES NULL
1515
ALTER TABLE t1 DROP COLUMN d;
1616
ALTER TABLE t1 ADD COLUMN d BIT(0) ;
1717
SHOW COLUMNS IN t1;
1818
Field Type Null Key Default Extra
1919
a bit(1) YES NULL
2020
b bit(20) YES NULL
21-
c bit(64) NO PRI b'0'
21+
c bit(64) NO PRI NULL
2222
d bit(1) YES NULL
2323
INSERT INTO t1 (a,b,c,d) VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1);
2424
SELECT BIN(a), HEX(b), c+0 FROM t1 WHERE d>0;
@@ -50,4 +50,4 @@ a+0 b+0 c+0 d+0
5050
1 0 18446744073709551615 0
5151
DROP TABLE t1;
5252
CREATE TABLE t1 (pk INT PRIMARY KEY, a BIT(65) ) ENGINE=rocksdb;
53-
ERROR 42000: Display width out of range for column 'a' (max = 64)
53+
ERROR 42000: Display width out of range for 'a' (max = 64)

‎storage/rocksdb/mysql-test/rocksdb/r/type_float.result

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10,pk) VALUES (
226226
6
227227
);
228228
Warnings:
229-
Warning 1292 Truncated incorrect DECIMAL value: ''
229+
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
230230
Warning 1264 Out of range value for column 'f' at row 1
231231
Warning 1264 Out of range value for column 'f0' at row 1
232232
Warning 1264 Out of range value for column 'r1_1' at row 1
@@ -298,9 +298,7 @@ r1_1 0.9
298298
r1_1 0.9
299299
r1_1 0.9
300300
ALTER TABLE t1 ADD COLUMN d0_0 DOUBLE(0,0) ;
301-
ERROR 42000: Display width out of range for column 'd0_0' (max = 255)
302301
ALTER TABLE t1 ADD COLUMN n66_6 DECIMAL(256,1) ;
303-
ERROR 42000: Too big precision 256 specified for column 'n66_6'. Maximum is 65.
302+
ERROR 42000: Too big precision 256 specified for 'n66_6'. Maximum is 65
304303
ALTER TABLE t1 ADD COLUMN n66_66 DECIMAL(40,35) ;
305-
ERROR 42000: Too big scale 35 specified for column 'n66_66'. Maximum is 30.
306304
DROP TABLE t1;

‎storage/rocksdb/mysql-test/rocksdb/r/type_varchar.result

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ SHOW COLUMNS IN t1;
2121
Field Type Null Key Default Extra
2222
v0 varchar(0) YES NULL
2323
v1 varchar(1) YES NULL
24-
v64 varchar(64) NO PRI
24+
v64 varchar(64) NO PRI NULL
2525
v65000 varchar(65000) YES NULL
2626
CREATE TABLE t2 (v VARCHAR(65532), PRIMARY KEY (v(255))) ENGINE=rocksdb;
2727
SHOW COLUMNS IN t2;
2828
Field Type Null Key Default Extra
29-
v varchar(65532) NO PRI
29+
v varchar(65532) NO PRI NULL
3030
INSERT INTO t1 (v0,v1,v64,v65000) VALUES ('','','','');
3131
INSERT INTO t1 (v0,v1,v64,v65000) VALUES ('','y','Once there, double check that an article doesn\'t already exist','Here is a list of recommended books on MariaDB and MySQL. We\'ve provided links to Amazon.com here for convenience, but they can be found at many other bookstores, both online and off.
3232

@@ -133,7 +133,7 @@ SHOW COLUMNS IN t1;
133133
Field Type Null Key Default Extra
134134
v0 varchar(0) YES NULL
135135
v1 varchar(1) YES NULL
136-
v64 varchar(64) NO PRI
136+
v64 varchar(64) NO PRI NULL
137137
v65000 varchar(65000) YES NULL
138138
v65536 mediumtext YES NULL
139139
DROP TABLE t1, t2;
@@ -418,7 +418,7 @@ insert into t1 values (3, 'a \t', 'a-tab');
418418
explain
419419
select col1, hex(col1) from t1;
420420
id select_type table type possible_keys key key_len ref rows Extra
421-
1 SIMPLE t1 ALL NULL NULL NULL NULL # NULL
421+
1 SIMPLE t1 ALL NULL NULL NULL NULL #
422422
select col1, hex(col1) from t1;
423423
col1 hex(col1)
424424
ab 00610062
@@ -448,7 +448,7 @@ insert into t1 values(23, repeat(' ',18), '18x-space');
448448
explain
449449
select pk, col1, hex(col1), length(col1) from t1;
450450
id select_type table type possible_keys key key_len ref rows Extra
451-
1 SIMPLE t1 # NULL NULL NULL NULL # NULL
451+
1 SIMPLE t1 # NULL NULL NULL NULL #
452452
select pk, col1, hex(col1), length(col1) from t1;
453453
pk col1 hex(col1) length(col1)
454454
10 0
@@ -530,7 +530,7 @@ insert into t1 values (3, 'a \t', 'a-tab');
530530
explain
531531
select col1, hex(col1) from t1;
532532
id select_type table type possible_keys key key_len ref rows Extra
533-
1 SIMPLE t1 ALL NULL NULL NULL NULL # NULL
533+
1 SIMPLE t1 ALL NULL NULL NULL NULL #
534534
select col1, hex(col1) from t1;
535535
col1 hex(col1)
536536
ab 6162
@@ -560,7 +560,7 @@ insert into t1 values(23, repeat(' ',18), '18x-space');
560560
explain
561561
select pk, col1, hex(col1), length(col1) from t1;
562562
id select_type table type possible_keys key key_len ref rows Extra
563-
1 SIMPLE t1 # NULL NULL NULL NULL # NULL
563+
1 SIMPLE t1 # NULL NULL NULL NULL #
564564
select pk, col1, hex(col1), length(col1) from t1;
565565
pk col1 hex(col1) length(col1)
566566
10 0
@@ -642,7 +642,7 @@ insert into t1 values (3, 'a \t', 'a-tab');
642642
explain
643643
select col1, hex(col1) from t1;
644644
id select_type table type possible_keys key key_len ref rows Extra
645-
1 SIMPLE t1 ALL NULL NULL NULL NULL # NULL
645+
1 SIMPLE t1 ALL NULL NULL NULL NULL #
646646
select col1, hex(col1) from t1;
647647
col1 hex(col1)
648648
ab 00610062
@@ -672,7 +672,7 @@ insert into t1 values(23, repeat(' ',18), '18x-space');
672672
explain
673673
select pk, col1, hex(col1), length(col1) from t1;
674674
id select_type table type possible_keys key key_len ref rows Extra
675-
1 SIMPLE t1 # NULL NULL NULL NULL # NULL
675+
1 SIMPLE t1 # NULL NULL NULL NULL #
676676
select pk, col1, hex(col1), length(col1) from t1;
677677
pk col1 hex(col1) length(col1)
678678
10 0

0 commit comments

Comments
 (0)