Merge branch '10.11' into 11.4

Author: vuvova

cmake/install_layout.cmake

@@ -163,6 +163,7 @@ SET(INSTALL_UNIX_ADDRDIR_RPM            "${INSTALL_MYSQLDATADIR_RPM}/mysql.sock"
 SET(INSTALL_SYSTEMD_UNITDIR_RPM         "/usr/lib/systemd/system")
 SET(INSTALL_SYSTEMD_SYSUSERSDIR_RPM     "/usr/lib/sysusers.d")
 SET(INSTALL_SYSTEMD_TMPFILESDIR_RPM     "/usr/lib/tmpfiles.d")
+SET(INSTALL_RUNDATADIR_RPM              "/run/mariadb")
 SET(INSTALL_PAMDIR_RPM                  "/${INSTALL_LIBDIR_RPM}/security")
 SET(INSTALL_PAMDATADIR_RPM              "/etc/security")
 
@@ -193,7 +194,8 @@ SET(INSTALL_SUPPORTFILESDIR_DEB         "share/mariadb")
 #
 SET(INSTALL_MYSQLDATADIR_DEB            "/var/lib/mysql")
 
-SET(INSTALL_UNIX_ADDRDIR_DEB            "/run/mysqld/mysqld.sock")
+SET(INSTALL_RUNDATADIR_DEB              "/run/mysqld")
+SET(INSTALL_UNIX_ADDRDIR_DEB            "${INSTALL_RUNDATADIR_DEB}/mysqld.sock")
 SET(INSTALL_SYSTEMD_UNITDIR_DEB         "/lib/systemd/system")
 SET(INSTALL_SYSTEMD_SYSUSERSDIR_DEB     "/usr/lib/sysusers.d")
 SET(INSTALL_SYSTEMD_TMPFILESDIR_DEB     "/usr/lib/tmpfiles.d")
@@ -257,3 +259,7 @@ IF(NOT MYSQL_UNIX_ADDR)
   SET(MYSQL_UNIX_ADDR ${INSTALL_UNIX_ADDRDIR})
 ENDIF()
 
+IF(NOT INSTALL_RUNDATADIR)
+  get_filename_component(MYSQL_UNIX_DIR ${MYSQL_UNIX_ADDR} DIRECTORY)
+  SET(INSTALL_RUNDATADIR "${MYSQL_UNIX_DIR}" CACHE FILEPATH "Rundata installation directory" ${FORCE})
+ENDIF()

cmake/systemd.cmake

@@ -50,8 +50,7 @@ MACRO(CHECK_SYSTEMD)
           SET(SYSTEMD_SCRIPTS ${SYSTEMD_SCRIPTS} galera_new_cluster galera_recovery)
         ENDIF()
         IF(DEB)
-          SET(SYSTEMD_EXECSTARTPRE "ExecStartPre=/usr/bin/install -m 755 -o mysql -g root -d /var/run/mysqld")
-          SET(SYSTEMD_EXECSTARTPOST "ExecStartPost=/etc/mysql/debian-start")
+          SET(SYSTEMD_EXECSTARTPOST "ExecStartPost=!/etc/mysql/debian-start")
         ENDIF()
 	IF(URING_FOUND)
 	  SET(SYSTEMD_LIMIT "# For liburing and io_uring_setup()

debian/control

@@ -980,8 +980,7 @@ Description: Connect storage engine JDBC interface for MariaDB server.
 
 Package: mariadb-plugin-s3
 Architecture: any
-Depends: libcurl4,
-         mariadb-server (= ${server:Version}),
+Depends: mariadb-server (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Amazon S3 archival storage engine for MariaDB
@@ -1010,8 +1009,7 @@ Description: RocksDB storage engine for MariaDB server
 
 Package: mariadb-plugin-oqgraph
 Architecture: any
-Depends: libjudydebian1,
-         mariadb-server (= ${server:Version}),
+Depends: mariadb-server (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-oqgraph-engine-10.0,
@@ -1076,8 +1074,7 @@ Description: Spider storage engine for MariaDB server
 
 Package: mariadb-plugin-gssapi-server
 Architecture: any
-Depends: libgssapi-krb5-2,
-         mariadb-server,
+Depends: mariadb-server (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-gssapi-server-10.1,
@@ -1100,8 +1097,7 @@ Description: GSSAPI authentication plugin for MariaDB server
 
 Package: mariadb-plugin-gssapi-client
 Architecture: any
-Depends: libgssapi-krb5-2,
-         mariadb-client (= ${binary:Version}),
+Depends: mariadb-client (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-gssapi-client-10.1,
@@ -1120,8 +1116,7 @@ Description: GSSAPI authentication plugin for MariaDB client
 
 Package: mariadb-plugin-cracklib-password-check
 Architecture: any
-Depends: libcrack2 (>= 2.9.0),
-         mariadb-server,
+Depends: mariadb-server,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: CrackLib Password Validation Plugin for MariaDB server
@@ -1134,8 +1129,7 @@ Description: CrackLib Password Validation Plugin for MariaDB server
 
 Package: mariadb-plugin-hashicorp-key-management
 Architecture: any
-Depends: libcurl4,
-         mariadb-server,
+Depends: mariadb-server,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Hashicorp Key Management plugin for MariaDB

debian/mariadb-server.install

@@ -15,6 +15,7 @@ lib/systemd/system/mariadb@.socket
 lib/systemd/system/mysql.service
 lib/systemd/system/mysqld.service
 support-files/rpm/enable_encryption.preset etc/mysql/mariadb.conf.d/99-enable-encryption.cnf.preset
+usr/lib/tmpfiles.d/mariadb.conf
 usr/bin/aria_chk
 usr/bin/aria_dump_log
 usr/bin/aria_ftdump

debian/not-installed

@@ -22,7 +22,6 @@ usr/lib/*/pkgconfig/mariadb.pc
 usr/bin/uca-dump
 usr/bin/wsrep_sst_backup
 usr/lib/sysusers.d/mariadb.conf # Not used (yet) in Debian systemd
-usr/lib/tmpfiles.d/mariadb.conf # Not used (yet) in Debian systemd
 usr/sbin/rcmysql
 usr/share/doc/mariadb-server/COPYING (related file: "debian/tmp/usr/share/mariadb/mroonga/COPYING")
 usr/share/doc/mariadb-server/CREDITS

mysql-test/main/alter_table_lock.result

@@ -1,23 +1,4 @@
 #
-# MDEV-23836: Assertion `! is_set() || m_can_overwrite_status' in
-# Diagnostics_area::set_error_status (interrupted ALTER TABLE under LOCK)
-#
-SET @max_session_mem_used_save= @@max_session_mem_used;
-CREATE TABLE t1 (a INT);
-SELECT * FROM t1;
-a
-ALTER TABLE x MODIFY xx INT;
-ERROR 42S02: Table 'test.x' doesn't exist
-SET SESSION max_session_mem_used= 8192;
-LOCK TABLE t1 WRITE;
-ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
-SET SESSION max_session_mem_used = @max_session_mem_used_save;
-UNLOCK TABLES;
-DROP TABLE t1;
-#
-# End of 10.5 tests
-#
-#
 # MDEV-28943 Online alter fails under LOCK TABLE with ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
 #
 create table t1 (f int) engine=innodb;
@@ -58,9 +39,6 @@ alter online table t1 add column s blob not null, algorithm=inplace;
 ERROR 0A000: LOCK=NONE is not supported. Reason: Fulltext index creation requires a lock. Try LOCK=SHARED
 drop table t1;
 #
-# End of 10.11 tests
-#
-#
 # MDEV-35611 Assertion failure in Diagnostics_area::sql_errno upon interrupted ALTER
 #
 CREATE TABLE t (a INT) ENGINE=MyISAM;
@@ -76,6 +54,4 @@ disconnect con1;
 connection default;
 UNLOCK TABLES;
 DROP TABLE t;
-#
 # End of 11.4 tests
-#

mysql-test/main/alter_table_lock.test

@@ -1,36 +1,6 @@
 --source include/not_embedded.inc
 --source include/have_innodb.inc
 
---echo #
---echo # MDEV-23836: Assertion `! is_set() || m_can_overwrite_status' in
---echo # Diagnostics_area::set_error_status (interrupted ALTER TABLE under LOCK)
---echo #
-
-SET @max_session_mem_used_save= @@max_session_mem_used;
-
-CREATE TABLE t1 (a INT);
-SELECT * FROM t1;
-
---error ER_NO_SUCH_TABLE
-ALTER TABLE x MODIFY xx INT;
-
-SET SESSION max_session_mem_used= 8192;
---error 0,ER_OPTION_PREVENTS_STATEMENT
-LOCK TABLE t1 WRITE;
-
---disable_warnings
---error 0,ER_OPTION_PREVENTS_STATEMENT
-ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
---enable_warnings
-
-SET SESSION max_session_mem_used = @max_session_mem_used_save;
-UNLOCK TABLES;
-DROP TABLE t1;
-
---echo #
---echo # End of 10.5 tests
---echo #
-
 --echo #
 --echo # MDEV-28943 Online alter fails under LOCK TABLE with ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
 --echo #
@@ -75,10 +45,6 @@ lock table t1 write;
 alter online table t1 add column s blob not null, algorithm=inplace;
 drop table t1;
 
---echo #
---echo # End of 10.11 tests
---echo #
-
 --echo #
 --echo # MDEV-35611 Assertion failure in Diagnostics_area::sql_errno upon interrupted ALTER
 --echo #
@@ -97,6 +63,4 @@ ALTER TABLE IF EXISTS t FORCE;
 UNLOCK TABLES;
 DROP TABLE t;
 
---echo #
 --echo # End of 11.4 tests
---echo #

mysql-test/main/derived_split_innodb.result

@@ -1030,6 +1030,71 @@ set statement optimizer_switch='split_materialized=off' for $query;
 a	b	name	total_amt
 1	NULL	A	10
 DROP TABLE t1,t2;
+#
+# MDEV-37407 Wrong result with ORDER BY LIMIT
+# Both, with and without split_materialized should
+# produce the same results
+#
+SET @save_optimizer_switch= @@optimizer_switch;
+CREATE TABLE t1
+(a varchar(35), b varchar(4), KEY (a))
+ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+('Albania','AXA'), ('Australia','AUS'), ('Myanmar','MMR'),
+('Bahamas','BS'), ('Brazil','BRA'), ('Barbados','BRB');
+CREATE TABLE t2
+(a varchar(4), b varchar(50), PRIMARY KEY (b,a), KEY (a))
+ENGINE=InnoDB;
+INSERT INTO t2 VALUES
+('AUS','Anglican'), ('MMR','Baptist'), ('BS','Anglican'),
+('BS','Baptist'), ('BS','Methodist'), ('BRB','Methodist'),
+('BRA','Baptist'), ('USA','Baptist');
+ANALYZE TABLE t1 PERSISTENT FOR ALL;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+ANALYZE TABLE t2 PERSISTENT FOR ALL;
+Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	Engine-independent statistics collected
+test.t2	analyze	status	OK
+set optimizer_switch='split_materialized=off';
+SELECT t1.a
+FROM (SELECT a FROM t2 GROUP BY a ORDER BY a, COUNT(DISTINCT b) LIMIT 1) dt
+JOIN t1 ON
+dt.a=t1.b
+WHERE t1.a LIKE 'B%';
+a
+set optimizer_switch='split_materialized=on';
+SELECT t1.a
+FROM (SELECT a FROM t2 GROUP BY a ORDER BY a, COUNT(DISTINCT b) LIMIT 1) dt
+JOIN t1 ON
+dt.a=t1.b
+WHERE t1.a LIKE 'B%';
+a
+DROP TABLE t1,t2;
+SET optimizer_switch= @save_optimizer_switch;
+#
+# MDEV-29638 Crash when considering Split-Materialized plan
+#
+set @save_optimizer_switch= @@optimizer_switch;
+set optimizer_switch='condition_pushdown_for_derived=off,split_materialized=on';
+CREATE TABLE t1 (id int PRIMARY KEY)engine=innodb;
+CREATE TABLE t2 (id int PRIMARY KEY, c int) engine=innodb;
+CREATE TABLE t3 (id int PRIMARY KEY, a int , b int, KEY (a))engine=innodb;
+SELECT * FROM
+(
+SELECT DISTINCT t1.id
+FROM t1 JOIN
+(
+SELECT t2.id FROM t2 JOIN t3
+ON t3.id = t2.c
+WHERE (t3.a > 2 AND t3.b = 2)
+GROUP BY t2.id
+) m2 ON m2.id = t1.id
+) dt;
+id
+drop table t1, t2, t3;
+SET optimizer_switch= @save_optimizer_switch;
 # End of 10.11 tests
 #
 # MDEV-37057 Wrong result with LATERAL DERIVED

mysql-test/main/derived_split_innodb.test

@@ -632,6 +632,77 @@ evalp set statement optimizer_switch='split_materialized=off' for $query;
 
 DROP TABLE t1,t2;
 
+--echo #
+--echo # MDEV-37407 Wrong result with ORDER BY LIMIT
+--echo # Both, with and without split_materialized should
+--echo # produce the same results
+--echo #
+
+SET @save_optimizer_switch= @@optimizer_switch;
+
+CREATE TABLE t1
+  (a varchar(35), b varchar(4), KEY (a))
+ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES
+('Albania','AXA'), ('Australia','AUS'), ('Myanmar','MMR'),
+('Bahamas','BS'), ('Brazil','BRA'), ('Barbados','BRB');
+ 
+CREATE TABLE t2
+  (a varchar(4), b varchar(50), PRIMARY KEY (b,a), KEY (a))
+ENGINE=InnoDB;
+
+INSERT INTO t2 VALUES
+('AUS','Anglican'), ('MMR','Baptist'), ('BS','Anglican'),
+('BS','Baptist'), ('BS','Methodist'), ('BRB','Methodist'),
+('BRA','Baptist'), ('USA','Baptist');
+
+ANALYZE TABLE t1 PERSISTENT FOR ALL;
+ANALYZE TABLE t2 PERSISTENT FOR ALL;
+
+let $q=
+SELECT t1.a
+FROM (SELECT a FROM t2 GROUP BY a ORDER BY a, COUNT(DISTINCT b) LIMIT 1) dt
+     JOIN t1 ON
+     dt.a=t1.b
+WHERE t1.a LIKE 'B%';
+
+set optimizer_switch='split_materialized=off';
+eval $q;
+
+set optimizer_switch='split_materialized=on';
+eval $q;
+
+DROP TABLE t1,t2;
+
+SET optimizer_switch= @save_optimizer_switch;
+
+--echo #
+--echo # MDEV-29638 Crash when considering Split-Materialized plan
+--echo #
+
+set @save_optimizer_switch= @@optimizer_switch;
+set optimizer_switch='condition_pushdown_for_derived=off,split_materialized=on';
+
+CREATE TABLE t1 (id int PRIMARY KEY)engine=innodb;
+CREATE TABLE t2 (id int PRIMARY KEY, c int) engine=innodb;
+CREATE TABLE t3 (id int PRIMARY KEY, a int , b int, KEY (a))engine=innodb;
+
+SELECT * FROM
+(
+  SELECT DISTINCT t1.id
+    FROM t1 JOIN
+  (
+     SELECT t2.id FROM t2 JOIN t3
+       ON t3.id = t2.c
+       WHERE (t3.a > 2 AND t3.b = 2)
+       GROUP BY t2.id
+  ) m2 ON m2.id = t1.id
+) dt;
+
+drop table t1, t2, t3;
+SET optimizer_switch= @save_optimizer_switch;
+
 --echo # End of 10.11 tests
 
 --echo #

mysql-test/main/distinct.result

@@ -212,7 +212,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	1	Using index
 explain SELECT distinct a from t3 order by a desc limit 2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t3	index	NULL	a	5	NULL	40	Using index
+1	SIMPLE	t3	range	a	a	5	NULL	10	Using index for group-by; Using temporary; Using filesort
 explain SELECT distinct a,b from t3 order by a+1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	204	Using temporary; Using filesort