Skip to content

Commit bbd558c

Browse files
forkfunforkfun
committed
Merge branch '10.11' into '11.4'
2 parents 1fb0755 + 0d59c43 commit bbd558c

83 files changed

Lines changed: 1155 additions & 456 deletions

File tree

Some content is hidden

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

‎extra/mariabackup/backup_copy.cc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,6 +1950,14 @@ decrypt_decompress_file(const char *filepath, uint thread_n)
19501950

19511951
msg(thread_n,"%s\n", message.str().c_str());
19521952

1953+
/* all valid *.qp files are table-name-safe */
1954+
for (const char *s=filepath; *s; s++)
1955+
if (!isalnum(*s) && !strchr("-.@/_#", *s))
1956+
{
1957+
msg(thread_n,"Error: invalid file name\n");
1958+
return(false);
1959+
}
1960+
19531961
if (system(cmd.str().c_str()) != 0) {
19541962
return(false);
19551963
}

‎mysql-test/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616

1717
INSTALL_MYSQL_TEST("." "")
1818

19+
IF (NOT CMAKE_REAL_SOURCE_DIR)
20+
get_filename_component(CMAKE_REAL_SOURCE_DIR "${CMAKE_SOURCE_DIR}" REALPATH)
21+
get_filename_component(CMAKE_REAL_BINARY_DIR "${CMAKE_BINARY_DIR}" REALPATH)
22+
ENDIF()
23+
1924
IF(NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
2025
# Enable running mtr from build directory
2126
CONFIGURE_FILE(

‎mysql-test/main/dyncol.result‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,4 +1979,11 @@ drop table t1;
19791979
#
19801980
SELECT COLUMN_JSON(1000);
19811981
ERROR HY000: Encountered illegal format of dynamic column string
1982+
#
1983+
# MDEV-39581 dynamic column header missing sanity checks
1984+
#
1985+
SELECT COLUMN_LIST(0x040100FFFF00000300666F6F21626172);
1986+
ERROR HY000: Encountered illegal format of dynamic column string
1987+
SELECT COLUMN_JSON(CONCAT(0x040200020001000000000000004241, REPEAT('D', 512)));
1988+
ERROR HY000: Encountered illegal format of dynamic column string
19821989
# End of 10.6 tests

‎mysql-test/main/dyncol.test‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,4 +1033,14 @@ drop table t1;
10331033
--error ER_DYN_COL_WRONG_FORMAT
10341034
SELECT COLUMN_JSON(1000);
10351035

1036+
1037+
--echo #
1038+
--echo # MDEV-39581 dynamic column header missing sanity checks
1039+
--echo #
1040+
--error ER_DYN_COL_WRONG_FORMAT
1041+
SELECT COLUMN_LIST(0x040100FFFF00000300666F6F21626172);
1042+
1043+
--error ER_DYN_COL_WRONG_FORMAT
1044+
SELECT COLUMN_JSON(CONCAT(0x040200020001000000000000004241, REPEAT('D', 512)));
1045+
10361046
--echo # End of 10.6 tests

‎mysql-test/main/func_gconcat.result‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,3 +1538,21 @@ DROP VIEW v1;
15381538
DROP TABLE t1;
15391539
SET NAMES latin1;
15401540
# End of 10.5 tests
1541+
#
1542+
# MDEV-39673 group_concat ignores max_allowed_packet
1543+
#
1544+
connect u,localhost,root;
1545+
set group_concat_max_len=2*1024*1024*1024;
1546+
Warnings:
1547+
Warning 1292 Truncated incorrect group_concat_max_len value: '2147483648'
1548+
select @@group_concat_max_len;
1549+
@@group_concat_max_len
1550+
1073741824
1551+
select length(group_concat(repeat('a', @@max_allowed_packet-1), repeat('a', @@max_allowed_packet-1))) from dual;
1552+
length(group_concat(repeat('a', @@max_allowed_packet-1), repeat('a', @@max_allowed_packet-1)))
1553+
16777216
1554+
Warnings:
1555+
Warning 1260 Row 1 was cut by GROUP_CONCAT()
1556+
disconnect u;
1557+
connection default;
1558+
# End of 10.6 tests

‎mysql-test/main/func_gconcat.test‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,3 +1125,15 @@ DROP TABLE t1;
11251125
SET NAMES latin1;
11261126

11271127
--echo # End of 10.5 tests
1128+
1129+
--echo #
1130+
--echo # MDEV-39673 group_concat ignores max_allowed_packet
1131+
--echo #
1132+
connect u,localhost,root;
1133+
set group_concat_max_len=2*1024*1024*1024;
1134+
select @@group_concat_max_len;
1135+
select length(group_concat(repeat('a', @@max_allowed_packet-1), repeat('a', @@max_allowed_packet-1))) from dual;
1136+
disconnect u;
1137+
connection default;
1138+
1139+
--echo # End of 10.6 tests

‎mysql-test/main/func_json_notembedded.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ connect u,localhost,root;
33
#
44
# MDEV-24909 JSON functions don't respect KILL QUERY / max_statement_time limit
55
#
6-
set group_concat_max_len= 4294967295;
6+
set group_concat_max_len= 1000000000;
77
set @obj=concat_ws('','{', repeat('"a":"b",', 1250000/2), '"c":"d"}');
88
set @arr=concat_ws('','[', repeat('1234567,', 1250000/2), '2345678]');
99
select length(@obj), length(@arr);

‎mysql-test/main/func_json_notembedded.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ connect u,localhost,root;
99
--echo #
1010
--echo # MDEV-24909 JSON functions don't respect KILL QUERY / max_statement_time limit
1111
--echo #
12-
set group_concat_max_len= 4294967295;
12+
set group_concat_max_len= 1000000000;
1313

1414
set @obj=concat_ws('','{', repeat('"a":"b",', 1250000/2), '"c":"d"}');
1515
set @arr=concat_ws('','[', repeat('1234567,', 1250000/2), '2345678]');

‎mysql-test/main/gis.result‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5595,4 +5595,10 @@ mp
55955595
SELECT ST_GeomFromWKB(x'01070000000100000001070000000100000001070000000100000001020000000100000000000000') IS NOT NULL AS gc;
55965596
gc
55975597
0
5598+
#
5599+
# MDEV-39657 ASAN error on malformed WKB point
5600+
#
5601+
SELECT HEX(ST_GeometryN(0x000000000107000000010000000101000000, 1));
5602+
HEX(ST_GeometryN(0x000000000107000000010000000101000000, 1))
5603+
NULL
55985604
# End of 10.6 tests

‎mysql-test/main/gis.test‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3568,4 +3568,9 @@ SELECT ST_GeomFromWKB(x'01050000000200000001020000000200000000000000000000000000
35683568
SELECT ST_GeomFromWKB(x'01060000000100000001030000000100000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000') IS NOT NULL AS mp;
35693569
SELECT ST_GeomFromWKB(x'01070000000100000001070000000100000001070000000100000001020000000100000000000000') IS NOT NULL AS gc;
35703570

3571+
--echo #
3572+
--echo # MDEV-39657 ASAN error on malformed WKB point
3573+
--echo #
3574+
SELECT HEX(ST_GeometryN(0x000000000107000000010000000101000000, 1));
3575+
35713576
--echo # End of 10.6 tests

0 commit comments

Comments
 (0)