Skip to content

Commit 795ff0d

Browse files
sanja-byelkinsanja-byelkin
committed
Merge branch '10.6' into 10.7
2 parents d1a4f6e + a01abad commit 795ff0d

Some content is hidden

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

46 files changed

+740
-114
lines changed

‎CREDITS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ MariaDB Corporation https://www.mariadb.com (2013)
99
Microsoft https://microsoft.com/ (2017)
1010
ServiceNow https://servicenow.com (2019)
1111
SIT https://sit.org (2022)
12-
Tencent Cloud https://cloud.tencent.com (2017)
1312
Development Bank of Singapore https://dbs.com (2016)
1413
IBM https://www.ibm.com (2017)
15-
Visma https://visma.com (2015)
1614
Automattic https://automattic.com (2019)
1715
Galera Cluster https://galeracluster.com (2020)
1816
Percona https://www.percona.com (2018)

‎cmake/pcre.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ MACRO(BUNDLE_PCRE2)
5454
ExternalProject_Add(
5555
pcre2
5656
PREFIX "${dir}"
57-
URL "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.zip"
58-
URL_MD5 798698846982ce171d881ed0d7535c2a
57+
URL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.zip"
58+
URL_MD5 fe90992fbfb03f854bd9f344074f49eb
5959
INSTALL_COMMAND ""
6060
CMAKE_ARGS
6161
"-DCMAKE_WARN_DEPRECATED=FALSE"

‎extra/wolfssl/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ IF(WOLFSSL_X86_64_BUILD)
157157
${WOLFCRYPT_SRCDIR}/sha512_asm.S
158158
${WOLFCRYPT_SRCDIR}/sha256_asm.S)
159159
ADD_DEFINITIONS(-maes -msse4.2 -mpclmul)
160+
# WolfSSL 5.5.4 bug - user_settings.h not included into aes_asm.S
161+
SET_PROPERTY(SOURCE ${WOLFCRYPT_SRCDIR}/aes_asm.S APPEND PROPERTY COMPILE_OPTIONS "-DWOLFSSL_X86_64_BUILD")
160162
ENDIF()
161163
ENDIF()
162164

‎extra/wolfssl/wolfssl

Submodule wolfssl updated 522 files

‎libmariadb

‎mysql-test/main/constraints.result

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@ t1 CREATE TABLE `t1` (
183183
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
184184
DROP PROCEDURE sp;
185185
DROP TABLE t1;
186+
#
186187
# End of 10.2 tests
188+
#
187189
create table t1 (a int check (a>10)) select 100 as 'a';
188190
show create table t1;
189191
Table Create Table
@@ -201,3 +203,35 @@ a
201203
19
202204
ccc
203205
drop table t1;
206+
create table t1 (a int, b int);
207+
create procedure sp() alter table t1 add constraint if not exists foo check (b > 0);
208+
call sp;
209+
show create table t1;
210+
Table Create Table
211+
t1 CREATE TABLE `t1` (
212+
`a` int(11) DEFAULT NULL,
213+
`b` int(11) DEFAULT NULL,
214+
CONSTRAINT `foo` CHECK (`b` > 0)
215+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
216+
call sp;
217+
Warnings:
218+
Note 1826 Duplicate CHECK constraint name 'foo'
219+
show create table t1;
220+
Table Create Table
221+
t1 CREATE TABLE `t1` (
222+
`a` int(11) DEFAULT NULL,
223+
`b` int(11) DEFAULT NULL,
224+
CONSTRAINT `foo` CHECK (`b` > 0)
225+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
226+
call sp;
227+
Warnings:
228+
Note 1826 Duplicate CHECK constraint name 'foo'
229+
show create table t1;
230+
Table Create Table
231+
t1 CREATE TABLE `t1` (
232+
`a` int(11) DEFAULT NULL,
233+
`b` int(11) DEFAULT NULL,
234+
CONSTRAINT `foo` CHECK (`b` > 0)
235+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
236+
drop procedure sp;
237+
drop table t1;

‎mysql-test/main/constraints.test

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@ show create table t1;
151151
DROP PROCEDURE sp;
152152
DROP TABLE t1;
153153

154+
--echo #
154155
--echo # End of 10.2 tests
156+
--echo #
155157

156158
#
157159
# Check that we don't lose constraints as part of CREATE ... SELECT
@@ -172,3 +174,18 @@ insert into t1 values ("ccc");
172174
insert into t1 values ("");
173175
select * from t1;
174176
drop table t1;
177+
178+
#
179+
# add if not exists in SP
180+
#
181+
182+
create table t1 (a int, b int);
183+
create procedure sp() alter table t1 add constraint if not exists foo check (b > 0);
184+
call sp;
185+
show create table t1;
186+
call sp;
187+
show create table t1;
188+
call sp;
189+
show create table t1;
190+
drop procedure sp;
191+
drop table t1;

‎mysql-test/main/func_json.result

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1611,6 +1611,18 @@ SELECT json_object('a', coalesce(json_object('b', 'c')));
16111611
json_object('a', coalesce(json_object('b', 'c')))
16121612
{"a": {"b": "c"}}
16131613
#
1614+
# MDEV-26392: Crash with json_get_path_next and 10.5.12
1615+
#
1616+
CREATE TABLE arrNestTest (
1617+
id VARCHAR(80) AS (JSON_COMPACT(JSON_EXTRACT(doc, "$._id"))) UNIQUE KEY,
1618+
doc JSON,
1619+
CONSTRAINT id_not_null CHECK(id IS NOT NULL));
1620+
INSERT INTO test.arrNestTest (doc) VALUES ('{ "_id" : { "$oid" : "611c0a463b150154132f6636" }, "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : 1.0 } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] }');
1621+
SELECT * FROM arrNestTest;
1622+
id doc
1623+
{"$oid":"611c0a463b150154132f6636"} { "_id" : { "$oid" : "611c0a463b150154132f6636" }, "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : 1.0 } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] }
1624+
DROP TABLE arrNestTest;
1625+
#
16141626
# MDEV-26054 Server crashes in Item_func_json_arrayagg::get_str_from_field
16151627
#
16161628
CREATE TABLE t (a VARCHAR(8));

‎mysql-test/main/func_json.test

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,6 +1054,18 @@ DROP TABLE t2;
10541054
SELECT json_object('a', if(1, json_object('b', 'c'), json_object('e', 'f')));
10551055
SELECT json_object('a', coalesce(json_object('b', 'c')));
10561056

1057+
--echo #
1058+
--echo # MDEV-26392: Crash with json_get_path_next and 10.5.12
1059+
--echo #
1060+
1061+
CREATE TABLE arrNestTest (
1062+
id VARCHAR(80) AS (JSON_COMPACT(JSON_EXTRACT(doc, "$._id"))) UNIQUE KEY,
1063+
doc JSON,
1064+
CONSTRAINT id_not_null CHECK(id IS NOT NULL));
1065+
1066+
INSERT INTO test.arrNestTest (doc) VALUES ('{ "_id" : { "$oid" : "611c0a463b150154132f6636" }, "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : [ { "a" : 1.0 } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] } ] }');
1067+
SELECT * FROM arrNestTest;
1068+
DROP TABLE arrNestTest;
10571069

10581070
--echo #
10591071
--echo # MDEV-26054 Server crashes in Item_func_json_arrayagg::get_str_from_field

‎mysql-test/main/join.result

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3407,3 +3407,20 @@ id select_type table type possible_keys key key_len ref rows Extra
34073407
drop table t1,t2,t3;
34083408
drop table t1000,t10,t03;
34093409
# End of 10.3 tests
3410+
#
3411+
# MDEV-30080 Wrong result with LEFT JOINs involving constant tables
3412+
#
3413+
CREATE TABLE t1 (a INT) ENGINE=MyISAM;
3414+
INSERT INTO t1 VALUES (1);
3415+
CREATE TABLE t2 (b INT) ENGINE=MyISAM;
3416+
INSERT INTO t2 VALUES (1),(1);
3417+
CREATE TABLE t3 (c INT PRIMARY KEY) ENGINE=MyISAM;
3418+
SELECT * FROM t1 LEFT JOIN (t2 LEFT JOIN t3 ON t2.b = t3.c) ON t1.a = t2.b;
3419+
a b c
3420+
1 1 NULL
3421+
1 1 NULL
3422+
SELECT COUNT(*) FROM t1 LEFT JOIN (t2 LEFT JOIN t3 ON t2.b = t3.c) ON t1.a = t2.b;
3423+
COUNT(*)
3424+
2
3425+
DROP TABLE t1, t2, t3;
3426+
# End of 10.5 tests

0 commit comments

Comments
 (0)