Merge 11.4 into 11.8

Author: dr-m

.gitignore

@@ -30,6 +30,7 @@ Docs/INFO_BIN
 Docs/INFO_SRC
 Makefile
 TAGS
+mariadb-plugin-columnstore.install.generated
 Testing/
 tmp/
 VERSION.dep

extra/mariabackup/xtrabackup.cc

@@ -1237,7 +1237,7 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 		msg("DDL tracking : create %" PRIu32 " \"%.*s\"",
 			space_id, int(len), name);
 		fail = !check_if_skip_table(spacename.c_str());
-		if (!opt_no_lock && fail &&
+		if (fail && !opt_no_lock &&
 		    check_if_fts_table(spacename.c_str())) {
 			/* Ignore the FTS internal table because InnoDB does
 			create intermediate table and their associative FTS
@@ -1264,6 +1264,11 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 		break;
 	case FILE_DELETE:
 		fail = !check_if_skip_table(spacename.c_str())
+			/* Ignore the FTS internal table because InnoDB may
+			drop intermediate table and their associative FTS
+			internal table as a part of inplace rollback operation.
+			backup_set_alter_copy_lock() downgrades the
+			MDL_BACKUP_DDL before inplace phase of alter */
 			&& !check_if_fts_table(spacename.c_str());
 		msg("DDL tracking : delete %" PRIu32 " \"%.*s\"",
 			space_id, int(len), name);
@@ -5877,6 +5882,8 @@ void CorruptedPages::backup_fix_ddl(ds_ctxt *ds_data, ds_ctxt *ds_meta)
 					 node, 0, dest_name.c_str(),
 					 wf_write_through, *this);
 	}
+
+	DBUG_MARIABACKUP_EVENT("after_backup_fix_ddl", {});
 }
 
 

include/mysql_com.h

@@ -406,6 +406,13 @@ enum mariadb_field_attr_t
 
 #define SERVER_STATUS_ANSI_QUOTES       32768U
 
+/*
+  Set for stored procedures if the select query returned a row
+  To check for an empty query, one must also check thd::get_sent_row_count()
+*/
+
+#define SERVER_STATUS_RETURNED_ROW      (1U << 16)
+
 /**
   Server status flags that must be cleared when starting
   execution of a new SQL statement.
@@ -422,7 +429,8 @@ enum mariadb_field_attr_t
                                  SERVER_STATUS_DB_DROPPED |\
                                  SERVER_STATUS_CURSOR_EXISTS|\
                                  SERVER_STATUS_LAST_ROW_SENT|\
-                                 SERVER_SESSION_STATE_CHANGED)
+                                 SERVER_SESSION_STATE_CHANGED|\
+                                 SERVER_STATUS_RETURNED_ROW)
 
 #define MYSQL_ERRMSG_SIZE	512
 #define NET_READ_TIMEOUT	30		/* Timeout on read */

mysql-test/main/func_regexp_pcre.result

@@ -791,7 +791,7 @@ SELECT 'AB' RLIKE 'A# this is a comment\nB';
 1
 SET default_regex_flags=DEFAULT;
 SELECT 'Aq' RLIKE 'A\\q';
-ERROR 42000: Regex error 'unrecognized character follows \ at offset 2'
+ERROR 42000: Regex error 'unrecognized character follows \ at offset 3'
 SET default_regex_flags='EXTRA';
 SELECT 'A' RLIKE 'B';
 'A' RLIKE 'B'

mysql-test/main/func_regexp_pcre.test

@@ -382,6 +382,8 @@ SELECT 'AB' RLIKE 'A B';
 SELECT 'AB' RLIKE 'A# this is a comment\nB';
 SET default_regex_flags=DEFAULT;
 
+# pcre2 versions differ in the reported error offset for invalid escapes
+--replace_regex /offset 2/offset 3/
 --error ER_REGEXP_ERROR
 SELECT 'Aq' RLIKE 'A\\q';
 

mysql-test/main/gis.test

@@ -371,7 +371,7 @@ insert into t1 values ('85984',GeomFromText('MULTIPOLYGON(((-115.006363
 
 # Expected results are 115.2970604672862 and 36.23335610879993, but IA64 returns
 # slightly different values due to fused multiply-add instructions.
---replace_result 115.29706047613604 115.2970604672862 36.23335611157958 36.23335610879993
+--replace_regex /115.2970604[67]\d+/115.2970604672862/ /36.233356111579\d+/36.23335610879993/
 select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
 t1 where object_id=85998;
 

mysql-test/main/kill-2.result

@@ -4,10 +4,9 @@
 create user foo@'127.0.0.1';
 connect  con1,127.0.0.1,foo,,;
 connection default;
-select user from information_schema.processlist;
+select user from information_schema.processlist where id=$con1_id;
 user
 foo
-root
 kill user foo@'127.0.0.1';
 drop user foo@'127.0.0.1';
 #
@@ -28,11 +27,11 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 kill user a;
 kill user x;
 connection a;
-show processlist;
-Id	User	Host	db	Command	Time	State	Info	Progress
-#	root	#	test	#	#	#	#	#
-#	a	#	NULL	#	#	#	#	#
-#	b	#	test	#	#	#	#	#
+select user from information_schema.processlist where id in (connection_id(), $b_id, $default_id) order by user;
+user
+a
+b
+root
 kill user b;
 ERROR HY000: Operation KILL USER failed for b@%
 connection default;

mysql-test/main/kill-2.test

@@ -16,9 +16,10 @@
 create user foo@'127.0.0.1';
 
 --connect (con1,127.0.0.1,foo,,)
+let $con1_id= `select connection_id()`;
 
 --connection default
-select user from information_schema.processlist;
+evalp select user from information_schema.processlist where id=$con1_id;
 kill user foo@'127.0.0.1';
 
 let $wait_condition=
@@ -31,20 +32,21 @@ drop user foo@'127.0.0.1';
 --echo #
 --echo # KILL USER and missing privileges
 --echo #
+let $default_id= `select connection_id()`;
 create user a@'127.0.0.1';
 create user b@'127.0.0.1';
 grant process on *.* to a@'127.0.0.1';
 grant select on *.* to b@'127.0.0.1';
 --connect a,127.0.0.1,a
 show grants;
 --connect b,127.0.0.1,b
+let $b_id= `select connection_id()`;
 --replace_column 1 # 3 # 5 # 6 # 9 #
 show processlist;
 kill user a; # existing connection, but not visible to current_user
 kill user x; # not existing connection
 --connection a
---replace_column 1 # 3 # 5 # 6 # 7 # 8 # 9 #
-show processlist;
+evalp select user from information_schema.processlist where id in (connection_id(), $b_id, $default_id) order by user;
 --error ER_KILL_DENIED_ERROR
 kill user b;
 --connection default

mysql-test/main/max_session_mem_used.result

@@ -45,6 +45,15 @@ REPAIR LOCAL TABLE t1 USE_FRM;
 REPAIR LOCAL TABLE t1;
 DROP TABLE t1;
 SET max_session_mem_used=default;
+#
+# MDEV-38005 Assertion `(yyvsp[-3].simple_string) < (yyvsp[-1].simple_string)' failed
+#
+SET max_session_mem_used=1;
+Warnings:
+Warning	1292	Truncated incorrect max_session_mem_used value: '1'
+CREATE TABLE t SELECT 1000000000000000000000000000000000000000000000000000000000000000000000000000000001 AS c;
+ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement
+SET max_session_mem_used=default;
 # End of 10.6 tests
 #
 # MDEV-37489: SIGSEGV in get_param_default_value | store_schema_params

mysql-test/main/max_session_mem_used.test

@@ -82,6 +82,14 @@ REPAIR LOCAL TABLE t1;
 DROP TABLE t1;
 SET max_session_mem_used=default;
 
+--echo #
+--echo # MDEV-38005 Assertion `(yyvsp[-3].simple_string) < (yyvsp[-1].simple_string)' failed
+--echo #
+SET max_session_mem_used=1;
+--error ER_OPTION_PREVENTS_STATEMENT
+CREATE TABLE t SELECT 1000000000000000000000000000000000000000000000000000000000000000000000000000000001 AS c;
+SET max_session_mem_used=default;
+
 --echo # End of 10.6 tests
 
 --echo #