Skip to content

Commit 1c58748

Browse files
dr-mdr-m
committed
Merge 10.4 into 10.5
2 parents 17be2b4 + eae968f commit 1c58748

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1622
-466
lines changed

‎include/violite.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates.
2-
Copyright (c) 2012, 2017, MariaDB Corporation.
2+
Copyright (c) 2012, 2020, MariaDB Corporation.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -278,6 +278,7 @@ struct st_vio
278278
#ifdef _WIN32
279279
HANDLE hPipe;
280280
OVERLAPPED overlapped;
281+
int shutdown_flag;
281282
#endif
282283
};
283284
#endif /* vio_violite_h_ */

‎mysql-test/include/ctype_numconv.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,12 @@ show create table t1;
194194
drop table t1;
195195

196196
select hex(concat(ceiling(0.5)));
197-
create table t1 as select concat(ceiling(0.5)) as c1;
197+
create table t1 as select ceiling(0.5) as c0, concat(ceiling(0.5)) as c1;
198198
show create table t1;
199199
drop table t1;
200200

201201
select hex(concat(floor(0.5)));
202-
create table t1 as select concat(floor(0.5)) as c1;
202+
create table t1 as select floor(0.5) as c0, concat(floor(0.5)) as c1;
203203
show create table t1;
204204
drop table t1;
205205

‎mysql-test/main/ctype_binary.result‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,21 +345,23 @@ drop table t1;
345345
select hex(concat(ceiling(0.5)));
346346
hex(concat(ceiling(0.5)))
347347
31
348-
create table t1 as select concat(ceiling(0.5)) as c1;
348+
create table t1 as select ceiling(0.5) as c0, concat(ceiling(0.5)) as c1;
349349
show create table t1;
350350
Table Create Table
351351
t1 CREATE TABLE `t1` (
352-
`c1` varbinary(4) DEFAULT NULL
352+
`c0` int(3) NOT NULL,
353+
`c1` varbinary(3) DEFAULT NULL
353354
) ENGINE=MyISAM DEFAULT CHARSET=latin1
354355
drop table t1;
355356
select hex(concat(floor(0.5)));
356357
hex(concat(floor(0.5)))
357358
30
358-
create table t1 as select concat(floor(0.5)) as c1;
359+
create table t1 as select floor(0.5) as c0, concat(floor(0.5)) as c1;
359360
show create table t1;
360361
Table Create Table
361362
t1 CREATE TABLE `t1` (
362-
`c1` varbinary(4) DEFAULT NULL
363+
`c0` int(3) NOT NULL,
364+
`c1` varbinary(3) DEFAULT NULL
363365
) ENGINE=MyISAM DEFAULT CHARSET=latin1
364366
drop table t1;
365367
select hex(concat(round(0.5)));

‎mysql-test/main/ctype_cp1251.result‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -757,21 +757,23 @@ drop table t1;
757757
select hex(concat(ceiling(0.5)));
758758
hex(concat(ceiling(0.5)))
759759
31
760-
create table t1 as select concat(ceiling(0.5)) as c1;
760+
create table t1 as select ceiling(0.5) as c0, concat(ceiling(0.5)) as c1;
761761
show create table t1;
762762
Table Create Table
763763
t1 CREATE TABLE `t1` (
764-
`c1` varchar(4) CHARACTER SET cp1251 DEFAULT NULL
764+
`c0` int(3) NOT NULL,
765+
`c1` varchar(3) CHARACTER SET cp1251 DEFAULT NULL
765766
) ENGINE=MyISAM DEFAULT CHARSET=latin1
766767
drop table t1;
767768
select hex(concat(floor(0.5)));
768769
hex(concat(floor(0.5)))
769770
30
770-
create table t1 as select concat(floor(0.5)) as c1;
771+
create table t1 as select floor(0.5) as c0, concat(floor(0.5)) as c1;
771772
show create table t1;
772773
Table Create Table
773774
t1 CREATE TABLE `t1` (
774-
`c1` varchar(4) CHARACTER SET cp1251 DEFAULT NULL
775+
`c0` int(3) NOT NULL,
776+
`c1` varchar(3) CHARACTER SET cp1251 DEFAULT NULL
775777
) ENGINE=MyISAM DEFAULT CHARSET=latin1
776778
drop table t1;
777779
select hex(concat(round(0.5)));

‎mysql-test/main/ctype_filename.result‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ SELECT @a:=CONVERT('aя' USING filename) AS `@a`, BINARY @a, REVERSE(@a), HEX(@a
2222
@a BINARY @a REVERSE(@a) HEX(@a) HEX(REVERSE(@a))
2323
aя a@r1 яa 61407231 40723161
2424
#
25+
# MDEV-22022 Various mangled SQL statements will crash 10.3 to 10.5 debug builds
26+
#
27+
SET CHARACTER_SET_CLIENT=17;
28+
SELECT doc.`Children`.0 FROM t1;
29+
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '?Children??0?FROM?t1' at line 1
30+
SET NAMES latin1;
31+
#
2532
# Start of 10.5 tests
2633
#
2734
#

‎mysql-test/main/ctype_filename.test‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@ SET NAMES utf8;
2929
SELECT @a:=CONVERT('aя' USING filename) AS `@a`, BINARY @a, REVERSE(@a), HEX(@a), HEX(REVERSE(@a));
3030

3131

32+
--echo #
33+
--echo # MDEV-22022 Various mangled SQL statements will crash 10.3 to 10.5 debug builds
34+
--echo #
35+
36+
SET CHARACTER_SET_CLIENT=17;
37+
--error ER_PARSE_ERROR
38+
SELECT doc.`Children`.0 FROM t1;
39+
SET NAMES latin1;
40+
41+
3242
--echo #
3343
--echo # Start of 10.5 tests
3444
--echo #

‎mysql-test/main/ctype_latin1.result‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,21 +1066,23 @@ drop table t1;
10661066
select hex(concat(ceiling(0.5)));
10671067
hex(concat(ceiling(0.5)))
10681068
31
1069-
create table t1 as select concat(ceiling(0.5)) as c1;
1069+
create table t1 as select ceiling(0.5) as c0, concat(ceiling(0.5)) as c1;
10701070
show create table t1;
10711071
Table Create Table
10721072
t1 CREATE TABLE `t1` (
1073-
`c1` varchar(4) DEFAULT NULL
1073+
`c0` int(3) NOT NULL,
1074+
`c1` varchar(3) DEFAULT NULL
10741075
) ENGINE=MyISAM DEFAULT CHARSET=latin1
10751076
drop table t1;
10761077
select hex(concat(floor(0.5)));
10771078
hex(concat(floor(0.5)))
10781079
30
1079-
create table t1 as select concat(floor(0.5)) as c1;
1080+
create table t1 as select floor(0.5) as c0, concat(floor(0.5)) as c1;
10801081
show create table t1;
10811082
Table Create Table
10821083
t1 CREATE TABLE `t1` (
1083-
`c1` varchar(4) DEFAULT NULL
1084+
`c0` int(3) NOT NULL,
1085+
`c1` varchar(3) DEFAULT NULL
10841086
) ENGINE=MyISAM DEFAULT CHARSET=latin1
10851087
drop table t1;
10861088
select hex(concat(round(0.5)));

‎mysql-test/main/ctype_ucs.result‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,21 +1950,23 @@ drop table t1;
19501950
select hex(concat(ceiling(0.5)));
19511951
hex(concat(ceiling(0.5)))
19521952
0031
1953-
create table t1 as select concat(ceiling(0.5)) as c1;
1953+
create table t1 as select ceiling(0.5) as c0, concat(ceiling(0.5)) as c1;
19541954
show create table t1;
19551955
Table Create Table
19561956
t1 CREATE TABLE `t1` (
1957-
`c1` varchar(4) CHARACTER SET ucs2 DEFAULT NULL
1957+
`c0` int(3) NOT NULL,
1958+
`c1` varchar(3) CHARACTER SET ucs2 DEFAULT NULL
19581959
) ENGINE=MyISAM DEFAULT CHARSET=latin1
19591960
drop table t1;
19601961
select hex(concat(floor(0.5)));
19611962
hex(concat(floor(0.5)))
19621963
0030
1963-
create table t1 as select concat(floor(0.5)) as c1;
1964+
create table t1 as select floor(0.5) as c0, concat(floor(0.5)) as c1;
19641965
show create table t1;
19651966
Table Create Table
19661967
t1 CREATE TABLE `t1` (
1967-
`c1` varchar(4) CHARACTER SET ucs2 DEFAULT NULL
1968+
`c0` int(3) NOT NULL,
1969+
`c1` varchar(3) CHARACTER SET ucs2 DEFAULT NULL
19681970
) ENGINE=MyISAM DEFAULT CHARSET=latin1
19691971
drop table t1;
19701972
select hex(concat(round(0.5)));

‎mysql-test/main/ctype_utf8.result‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2817,21 +2817,23 @@ drop table t1;
28172817
select hex(concat(ceiling(0.5)));
28182818
hex(concat(ceiling(0.5)))
28192819
31
2820-
create table t1 as select concat(ceiling(0.5)) as c1;
2820+
create table t1 as select ceiling(0.5) as c0, concat(ceiling(0.5)) as c1;
28212821
show create table t1;
28222822
Table Create Table
28232823
t1 CREATE TABLE `t1` (
2824-
`c1` varchar(4) CHARACTER SET utf8 DEFAULT NULL
2824+
`c0` int(3) NOT NULL,
2825+
`c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
28252826
) ENGINE=MyISAM DEFAULT CHARSET=latin1
28262827
drop table t1;
28272828
select hex(concat(floor(0.5)));
28282829
hex(concat(floor(0.5)))
28292830
30
2830-
create table t1 as select concat(floor(0.5)) as c1;
2831+
create table t1 as select floor(0.5) as c0, concat(floor(0.5)) as c1;
28312832
show create table t1;
28322833
Table Create Table
28332834
t1 CREATE TABLE `t1` (
2834-
`c1` varchar(4) CHARACTER SET utf8 DEFAULT NULL
2835+
`c0` int(3) NOT NULL,
2836+
`c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
28352837
) ENGINE=MyISAM DEFAULT CHARSET=latin1
28362838
drop table t1;
28372839
select hex(concat(round(0.5)));

0 commit comments

Comments
 (0)