MariaRocks port: more test result updates

Make the same changes as with rocksdb.col_opt_null a few csets before:
- MariaDB doesn't provide a default value for non-NULL columns
- Wording in error messages is different
- limits for DECIMAL columns are different
- YEAR(2) is deprecated but still supported

- Also added a --sorted_result for an I_S query.

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

@@ -161,7 +161,7 @@ PRIMARY KEY (a)
 ) ENGINE=rocksdb;
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
-a	decimal(10,0) unsigned	NO	PRI	0	
+a	decimal(10,0) unsigned	NO	PRI	NULL	
 b	decimal(10,0) unsigned	YES		NULL	
 INSERT INTO t1 (a,b) VALUES (1.0,-1.0);
 Warnings:
@@ -416,7 +416,7 @@ INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10,pk) VALUES (
 6
 );
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated
 Warning	1264	Out of range value for column 'f' at row 1
 Warning	1264	Out of range value for column 'f0' at row 1
 Warning	1264	Out of range value for column 'r1_1' at row 1
@@ -488,11 +488,9 @@ r1_1	0.9
 r1_1	0.9
 r1_1	0.9
 ALTER TABLE t1 ADD COLUMN d0_0 DOUBLE(0,0) UNSIGNED;
-ERROR 42000: Display width out of range for column 'd0_0' (max = 255)
 ALTER TABLE t1 ADD COLUMN n66_6 DECIMAL(256,1) UNSIGNED;
-ERROR 42000: Too big precision 256 specified for column 'n66_6'. Maximum is 65.
+ERROR 42000: Too big precision 256 specified for 'n66_6'. Maximum is 65
 ALTER TABLE t1 ADD COLUMN n66_66 DECIMAL(40,35) UNSIGNED;
-ERROR 42000: Too big scale 35 specified for column 'n66_66'. Maximum is 30.
 DROP TABLE t1;
 CREATE TABLE t1 (
 a DOUBLE UNSIGNED,
@@ -502,7 +500,7 @@ PRIMARY KEY (b)
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 a	double unsigned	YES		NULL	
-b	float unsigned	NO	PRI	0	
+b	float unsigned	NO	PRI	NULL	
 INSERT INTO t1 (a,b) VALUES (1.0,-1.0);
 Warnings:
 Warning	1264	Out of range value for column 'b' at row 1
@@ -725,7 +723,7 @@ t	tinyint(3) unsigned	YES		NULL
 s	smallint(5) unsigned	YES		NULL	
 m	mediumint(8) unsigned	YES		NULL	
 i	int(10) unsigned	YES		NULL	
-b	bigint(20) unsigned	NO	PRI	0	
+b	bigint(20) unsigned	NO	PRI	NULL	
 INSERT INTO t1 (t,s,m,i,b) VALUES (255,65535,16777215,4294967295,18446744073709551615);
 INSERT INTO t1 (t,s,m,i,b) VALUES (-1,-1,-1,-1,-1);
 Warnings:

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

@@ -161,7 +161,7 @@ PRIMARY KEY (a)
 ) ENGINE=rocksdb;
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
-a	decimal(10,0) unsigned zerofill	NO	PRI	0000000000	
+a	decimal(10,0) unsigned zerofill	NO	PRI	NULL	
 b	decimal(10,0) unsigned zerofill	YES		NULL	
 INSERT INTO t1 (a,b) VALUES (1.1,1234);
 Warnings:
@@ -412,7 +412,7 @@ INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10,pk) VALUES (
 6
 );
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated
 Warning	1264	Out of range value for column 'f' at row 1
 Warning	1264	Out of range value for column 'f0' at row 1
 Warning	1264	Out of range value for column 'r1_1' at row 1
@@ -484,11 +484,9 @@ r1_1	0.9
 r1_1	0.9
 r1_1	0.9
 ALTER TABLE t1 ADD COLUMN d0_0 DOUBLE(0,0) ZEROFILL;
-ERROR 42000: Display width out of range for column 'd0_0' (max = 255)
 ALTER TABLE t1 ADD COLUMN n66_6 DECIMAL(256,1) ZEROFILL;
-ERROR 42000: Too big precision 256 specified for column 'n66_6'. Maximum is 65.
+ERROR 42000: Too big precision 256 specified for 'n66_6'. Maximum is 65
 ALTER TABLE t1 ADD COLUMN n66_66 DECIMAL(40,35) ZEROFILL;
-ERROR 42000: Too big scale 35 specified for column 'n66_66'. Maximum is 30.
 DROP TABLE t1;
 CREATE TABLE t1 (
 a DOUBLE ZEROFILL,
@@ -498,7 +496,7 @@ PRIMARY KEY (b)
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 a	double unsigned zerofill	YES		NULL	
-b	float unsigned zerofill	NO	PRI	000000000000	
+b	float unsigned zerofill	NO	PRI	NULL	
 INSERT INTO t1 (a,b) VALUES (1,1234.5);
 SELECT a,b FROM t1;
 a	b
@@ -699,7 +697,7 @@ i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 4294967295	4294967295	4294967295	00000000004294967295	255	255	255	00000000000000000255	65535	65535	65535	00000000000000065535	16777215	16777215	16777215	00000000000016777215	18446744073709551615	18446744073709551615	18446744073709551615	18446744073709551615
 4294967295	4294967295	4294967295	00000000004294967295	255	255	255	00000000000000000255	65535	65535	65535	00000000000000065535	16777215	16777215	16777215	00000000000016777215	18446744073709551615	18446744073709551615	18446744073709551615	18446744073709551615
 ALTER TABLE t1 ADD COLUMN i257 INT(257) ZEROFILL;
-ERROR 42000: Display width out of range for column 'i257' (max = 255)
+ERROR 42000: Display width out of range for 'i257' (max = 255)
 DROP TABLE t1;
 CREATE TABLE t1 (
 t TINYINT ZEROFILL,
@@ -715,7 +713,7 @@ t	tinyint(3) unsigned zerofill	YES		NULL
 s	smallint(5) unsigned zerofill	YES		NULL	
 m	mediumint(8) unsigned zerofill	YES		NULL	
 i	int(10) unsigned zerofill	YES		NULL	
-b	bigint(20) unsigned zerofill	NO	PRI	00000000000000000000	
+b	bigint(20) unsigned zerofill	NO	PRI	NULL	
 INSERT INTO t1 (t,s,m,i,b) VALUES (1,10,100,1000,0);
 SELECT t,s,m,i,b FROM t1;
 t	s	m	i	b

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

@@ -10,7 +10,7 @@ y2 YEAR(2) ,
 pk DATETIME PRIMARY KEY
 ) ENGINE=rocksdb;
 Warnings:
-Warning	1818	YEAR(2) column type is deprecated. Creating YEAR(4) column instead.
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 d	date	YES		NULL	
@@ -19,7 +19,7 @@ ts	timestamp	YES		NULL
 t	time	YES		NULL	
 y	year(4)	YES		NULL	
 y4	year(4)	YES		NULL	
-y2	year(4)	YES		NULL	
+y2	year(2)	YES		NULL	
 pk	datetime	NO	PRI	NULL	
 SET @tm = '2012-04-09 05:27:00';
 INSERT INTO t1 (d,dt,ts,t,y,y4,y2,pk) VALUES
@@ -29,25 +29,25 @@ INSERT INTO t1 (d,dt,ts,t,y,y4,y2,pk) VALUES
 (DATE(@tm),@tm,TIMESTAMP(@tm),TIME(@tm),YEAR(@tm),YEAR(@tm),YEAR(@tm),'2012-12-12 12:12:15');
 SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
-0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	2000
-1000-01-01	1000-01-01 00:00:00	1970-01-01 03:00:01	-838:59:59	1901	1901	2000
-2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	2012
-9999-12-31	9999-12-31 23:59:59	2038-01-19 06:14:07	838:59:59	2155	2155	1999
+0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
+1000-01-01	1000-01-01 00:00:00	1970-01-01 00:00:01	-838:59:59	1901	1901	00
+2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	12
+9999-12-31	9999-12-31 23:59:59	2038-01-19 03:14:07	838:59:59	2155	2155	99
 INSERT INTO t1 (d,dt,ts,t,y,y4,y2,pk) VALUES
 ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1','2012-12-12 12:12:16');
 Warnings:
 Warning	1265	Data truncated for column 'd' at row 1
-Warning	1264	Out of range value for column 'dt' at row 1
-Warning	1264	Out of range value for column 'ts' at row 1
+Warning	1265	Data truncated for column 'dt' at row 1
+Warning	1265	Data truncated for column 'ts' at row 1
 Warning	1264	Out of range value for column 't' at row 1
 Warning	1264	Out of range value for column 'y' at row 1
 Warning	1264	Out of range value for column 'y4' at row 1
 Warning	1264	Out of range value for column 'y2' at row 1
 SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
-1000-01-01	1000-01-01 00:00:00	1970-01-01 03:00:01	-838:59:59	1901	1901	2000
-9999-12-31	9999-12-31 23:59:59	2038-01-19 06:14:07	838:59:59	2155	2155	1999
-0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	2000
-2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	2012
-0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	-838:59:59	0000	0000	0000
+1000-01-01	1000-01-01 00:00:00	1970-01-01 00:00:01	-838:59:59	1901	1901	00
+9999-12-31	9999-12-31 23:59:59	2038-01-19 03:14:07	838:59:59	2155	2155	99
+0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
+2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	12
+0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	-838:59:59	0000	0000	00
 DROP TABLE t1;

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

@@ -8,7 +8,7 @@ PRIMARY KEY (b)
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 a	enum('')	YES		NULL	
-b	enum('test1','test2','test3','test4','test5')	NO	PRI	test1	
+b	enum('test1','test2','test3','test4','test5')	NO	PRI	NULL	
 c	enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75')	YES		NULL	
 INSERT INTO t1 (a,b,c) VALUES ('','test2','4'),('',5,2);
 SELECT a,b,c FROM t1;
@@ -31,7 +31,7 @@ Note	1291	Column 'e' has duplicated value 'a' in ENUM
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 a	enum('')	YES		NULL	
-b	enum('test1','test2','test3','test4','test5')	NO	PRI	test1	
+b	enum('test1','test2','test3','test4','test5')	NO	PRI	NULL	
 c	enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75')	YES		NULL	
 e	enum('a','A')	YES		NULL	
 INSERT INTO t1 (a,b,c,e) VALUES ('','test3','75','A');

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

@@ -48,6 +48,7 @@ insert into t2 values (2, 'a',  'a');
 select pk, col1, hex(col1), col2 from t2;
 
 --echo # Check the format version:
+--sorted_result
 select table_name,index_name,kv_format_version 
 from information_schema.ROCKSDB_DDL 
 where TABLE_SCHEMA=database() AND table_name in ('t1','t2');