Merge 11.4 into 11.8

Author: dr-m

CONTRIBUTING.md

@@ -11,9 +11,7 @@ MariaDB Server has a vibrant community contributing in a wide range of areas. Th
 -   The MariaDB Foundation and MariaDB Corporation have a presence on Reddit, Twitter and Facebook. See the [social media page](https://mariadb.com/docs/general-resources/community/joining-the-community).
 
 ### Help document MariaDB
----
--   Contribute towards [documenting MariaDB Server](https://mariadb.com/docs/general-resources/about/readme/contributing-documentation) and its ecosystem by adding new content or improving existing content.
--   [Translate](https://mariadb.com/docs/general-resources/about/readme/contributing-documentation) existing documentation.
+-   Contribute towards [documenting MariaDB Server](https://mariadb.com/docs/general-resources/about/readme/contributing-documentation)  and its ecosystem by adding new content or improving existing content.
 
 ### Help develop MariaDB
 ---
@@ -34,14 +32,6 @@ You’re very welcome to support MariaDB Server as an individual, or talk your c
 ---
 -   Attend an event
     -   [Events and Conferences page](https://mariadb.org/events/)
-    -   [mariadb.meetup.com](https://mariadb.meetup.com/)
-
-### Live Q&A for beginner contributors
----
-MariaDB has a dedicated time each week when we answer new contributor questions live on Zulip.
-From 8:00 to 10:00 UTC on Mondays, and 10:00 to 12:00 UTC on Thursdays, anyone can ask any questions they’d like,
-and a live developer will be available to assist.
-New contributors can ask questions any time, but we will provide immediate feedback during that interval.
 
 ### Additional resources
 ----

cmake/win_compatibility.manifest

@@ -19,9 +19,10 @@
 
     </application>
   </compatibility>
-  <application>
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
       <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+      <heapType xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">SegmentHeap</heapType>
     </windowsSettings>
   </application>
 </asmv1:assembly>

include/json_lib.h

@@ -30,6 +30,7 @@ enum json_errors {
   JE_ESCAPING= -6,     /* Error in the escaping. */
 
   JE_DEPTH= -7,        /* The limit on the JSON depth was overrun. */
+  JE_KILLED= -8,       /* Killed during processing */
 };
 
 

mysql-test/main/bootstrap_innodb.result

@@ -1,8 +1,12 @@
 create table t1(a int) engine=innodb;
+#
+# MDEV-39541 mem_pressure::~mem_pressure() causes a crash on bootstrap
+#
 # restart
 select * from t1;
 a
 1
 2
 5
 drop table t1;
+# End of 10.11 tests

mysql-test/main/bootstrap_innodb.test

@@ -22,6 +22,18 @@ EOF
 exec $MYSQLD_BOOTSTRAP_CMD --datadir=$datadir --tmpdir=$MYSQL_TMP_DIR --innodb < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1;
 remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
 
+--echo #
+--echo # MDEV-39541 mem_pressure::~mem_pressure() causes a crash on bootstrap
+--echo #
+
+write_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
+SHUTDOWN;
+EOF
+exec $MYSQLD_BOOTSTRAP_CMD --datadir=$datadir --tmpdir=$MYSQL_TMP_DIR --innodb < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1;
+remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
+
 source include/start_mysqld.inc;
 select * from t1;
 drop table t1;
+
+--echo # End of 10.11 tests

mysql-test/main/column_compression.result

@@ -3075,3 +3075,19 @@ select * from (select * from t) as t natural join (select * from t) as t1;
 a	b
 drop tables t, t4;
 # End of 10.5 tests
+#
+# MDEV-39450: Memory corruption: overlapping memory ranges in `Field_longstr::compress` on UPDATE of compressed column
+#
+CREATE TABLE t (c VARCHAR(255) COMPRESSED);
+REPLACE INTO t VALUES ('abcdefghijklm');
+UPDATE t SET c=RIGHT(c,10);
+DROP TABLE t;
+CREATE TABLE t (c VARCHAR(255) COMPRESSED);
+REPLACE INTO t VALUES ('abcdefghijklm');
+UPDATE t SET c=SUBSTRING(c,3);
+DROP TABLE t;
+CREATE TABLE t (c VARCHAR(255) COMPRESSED);
+REPLACE INTO t VALUES ('abcdefghijklm');
+UPDATE t SET c=MID(c,2,4);
+DROP TABLE t;
+# End of 10.6 tests

mysql-test/main/column_compression.test

@@ -578,3 +578,24 @@ select * from (select * from t) as t natural join (select * from t) as t1;
 drop tables t, t4;
 
 --echo # End of 10.5 tests
+
+--echo #
+--echo # MDEV-39450: Memory corruption: overlapping memory ranges in `Field_longstr::compress` on UPDATE of compressed column
+--echo #
+
+CREATE TABLE t (c VARCHAR(255) COMPRESSED);
+REPLACE INTO t VALUES ('abcdefghijklm');
+UPDATE t SET c=RIGHT(c,10);
+DROP TABLE t;
+
+CREATE TABLE t (c VARCHAR(255) COMPRESSED);
+REPLACE INTO t VALUES ('abcdefghijklm');
+UPDATE t SET c=SUBSTRING(c,3);
+DROP TABLE t;
+
+CREATE TABLE t (c VARCHAR(255) COMPRESSED);
+REPLACE INTO t VALUES ('abcdefghijklm');
+UPDATE t SET c=MID(c,2,4);
+DROP TABLE t;
+
+--echo # End of 10.6 tests

mysql-test/main/cte_recursive.result

@@ -6067,7 +6067,7 @@ ERROR 42S22: Unknown column 'x' in 'SELECT'
 # MDEV-32299 Segfault when preparing unreferenced select in recursive CTE
 #
 SELECT ( WITH RECURSIVE x AS ( SELECT * FROM ( SELECT UTC_TIMESTAMP FROM ( SELECT ( WITH x AS ( WITH x AS ( SELECT * FROM x ) SELECT 1 ) SELECT 1 ) ) x ) x UNION SELECT NULL ) ( SELECT x FROM x ) ) ;
-ERROR 42S22: Unknown column 'x' in 'SELECT'
+ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'x'
 select (
 with recursive x as (
 select * from (
@@ -6089,7 +6089,7 @@ select null
 )
 (select x from x)
 );
-ERROR 42S22: Unknown column 'x' in 'SELECT'
+ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'x'
 select (
 with recursive r as (
 select * from (
@@ -6241,4 +6241,13 @@ y
 2
 2
 4
+#
+# MDEV-32326: Recursive reference in scalar subquery should be rejected
+#
+WITH RECURSIVE x AS (
+SELECT 1
+UNION
+SELECT  1 > ( WITH cte AS ( SELECT 1 FROM x )  SELECT 1 FROM cte ) )
+SELECT 1 FROM x;
+ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'x'
 # End of 10.11 tests

mysql-test/main/cte_recursive.test

@@ -4074,12 +4074,12 @@ SELECT ( WITH RECURSIVE x AS ( WITH x AS ( SELECT 1 FROM t14 ) SELECT x ) , t14
 --echo #
 
 # As in bug report
---error ER_BAD_FIELD_ERROR
+--error ER_NOT_STANDARD_COMPLIANT_RECURSIVE
 SELECT ( WITH RECURSIVE x AS ( SELECT * FROM ( SELECT UTC_TIMESTAMP FROM ( SELECT ( WITH x AS ( WITH x AS ( SELECT * FROM x ) SELECT 1 ) SELECT 1 ) ) x ) x UNION SELECT NULL ) ( SELECT x FROM x ) ) ;
 
 #0  0x00005555569dff7b in TABLE_LIST::reset_const_table (this=0x7fffe0019938) at ../src/sql/table.cc:9615
 #1  0x00005555569dffd4 in TABLE_LIST::reset_const_table (this=0x7fffe001a8c0) at ../src/sql/table.cc:9622
---error ER_BAD_FIELD_ERROR
+--error ER_NOT_STANDARD_COMPLIANT_RECURSIVE
 select (
   with recursive x as (
     select * from (
@@ -4243,4 +4243,15 @@ with recursive r (y) as (
   select z * 2 from r where z < 10)
 select y from r;
 
+--echo #
+--echo # MDEV-32326: Recursive reference in scalar subquery should be rejected
+--echo #
+
+--error ER_NOT_STANDARD_COMPLIANT_RECURSIVE
+WITH RECURSIVE x AS (
+    SELECT 1
+    UNION
+    SELECT  1 > ( WITH cte AS ( SELECT 1 FROM x )  SELECT 1 FROM cte ) )
+  SELECT 1 FROM x;
+
 --echo # End of 10.11 tests

mysql-test/main/derived_opt.result

@@ -566,4 +566,36 @@ DROP TABLE t1, t2;
 #
 # End of 10.3 tests
 #
+#
+# MDEV-24931: Assertion `prefix_size <= width' failed in
+#   Bitmap<64>::is_prefix with >64-column NATURAL JOIN on derived table
+#
+CREATE TABLE t1 (
+c1 INT, c2 INT, c3 INT, c4 INT, c5 INT, c6 INT, c7 INT, c8 INT,
+c9 INT, c10 INT, c11 INT, c12 INT, c13 INT, c14 INT, c15 INT, c16 INT,
+c17 INT, c18 INT, c19 INT, c20 INT, c21 INT, c22 INT, c23 INT, c24 INT,
+c25 INT, c26 INT, c27 INT, c28 INT, c29 INT, c30 INT, c31 INT, c32 INT,
+c33 INT, c34 INT, c35 INT, c36 INT, c37 INT, c38 INT, c39 INT, c40 INT,
+c41 INT, c42 INT, c43 INT, c44 INT, c45 INT, c46 INT, c47 INT, c48 INT,
+c49 INT, c50 INT, c51 INT, c52 INT, c53 INT, c54 INT, c55 INT, c56 INT,
+c57 INT, c58 INT, c59 INT, c60 INT, c61 INT, c62 INT, c63 INT, c64 INT,
+c65 INT
+) ENGINE=InnoDB;
+CREATE VIEW v1 AS SELECT * FROM t1;
+set optimizer_switch='derived_merge=off';
+# Derived table subquery
+SELECT * FROM t1 AS a NATURAL JOIN (SELECT * FROM t1) AS b;
+c1	c2	c3	c4	c5	c6	c7	c8	c9	c10	c11	c12	c13	c14	c15	c16	c17	c18	c19	c20	c21	c22	c23	c24	c25	c26	c27	c28	c29	c30	c31	c32	c33	c34	c35	c36	c37	c38	c39	c40	c41	c42	c43	c44	c45	c46	c47	c48	c49	c50	c51	c52	c53	c54	c55	c56	c57	c58	c59	c60	c61	c62	c63	c64	c65
+# View
+SELECT * FROM v1 NATURAL JOIN t1;
+c1	c2	c3	c4	c5	c6	c7	c8	c9	c10	c11	c12	c13	c14	c15	c16	c17	c18	c19	c20	c21	c22	c23	c24	c25	c26	c27	c28	c29	c30	c31	c32	c33	c34	c35	c36	c37	c38	c39	c40	c41	c42	c43	c44	c45	c46	c47	c48	c49	c50	c51	c52	c53	c54	c55	c56	c57	c58	c59	c60	c61	c62	c63	c64	c65
+# CTE
+WITH cte AS (SELECT * FROM t1) SELECT * FROM t1 NATURAL JOIN cte;
+c1	c2	c3	c4	c5	c6	c7	c8	c9	c10	c11	c12	c13	c14	c15	c16	c17	c18	c19	c20	c21	c22	c23	c24	c25	c26	c27	c28	c29	c30	c31	c32	c33	c34	c35	c36	c37	c38	c39	c40	c41	c42	c43	c44	c45	c46	c47	c48	c49	c50	c51	c52	c53	c54	c55	c56	c57	c58	c59	c60	c61	c62	c63	c64	c65
+set optimizer_switch= @save_optimizer_switch;
+DROP VIEW v1;
+DROP TABLE t1;
+#
+# End of 10.11 tests
+#
 set optimizer_switch=@exit_optimizer_switch;