Merge 10.3 into 10.4

Author: dr-m

extra/mariabackup/xtrabackup.cc

@@ -5723,7 +5723,7 @@ static bool xtrabackup_prepare_func(char** argv)
 
 error_cleanup:
 xb_filters_free();
-return ok;
+ return ok && !ib::error::was_logged();
 }
 
 /**************************************************************************

mysql-test/main/ps.result

@@ -5472,6 +5472,23 @@ drop procedure p;
 drop view v1;
 drop table t1;
 #
+# MDEV-22591 Debug build crashes on EXECUTE IMMEDIATE '... WHERE ?' USING IGNORE
+#
+CREATE TABLE t1 (a INT);
+EXECUTE IMMEDIATE 'SELECT * FROM t1 WHERE ?' USING IGNORE;
+ERROR HY000: Default/ignore value is not supported for such parameter usage
+EXECUTE IMMEDIATE 'SELECT * FROM t1 HAVING ?' USING IGNORE;
+ERROR HY000: Default/ignore value is not supported for such parameter usage
+EXECUTE IMMEDIATE 'SELECT * FROM t1 WHERE ?' USING 0;
+a
+EXECUTE IMMEDIATE 'SELECT * FROM t1 HAVING ?' USING 0;
+a
+DROP TABLE t1;
+EXECUTE IMMEDIATE 'SHOW DATABASES WHERE ?' USING DEFAULT;
+ERROR HY000: Default/ignore value is not supported for such parameter usage
+EXECUTE IMMEDIATE 'SHOW DATABASES WHERE ?' USING 0;
+Database
+#
 # End of 10.2 tests
 #
 #

mysql-test/main/ps.test

@@ -4914,6 +4914,23 @@ drop procedure p;
 drop view v1;
 drop table t1;
 
+
+--echo #
+--echo # MDEV-22591 Debug build crashes on EXECUTE IMMEDIATE '... WHERE ?' USING IGNORE
+--echo #
+
+CREATE TABLE t1 (a INT);
+--error ER_INVALID_DEFAULT_PARAM
+EXECUTE IMMEDIATE 'SELECT * FROM t1 WHERE ?' USING IGNORE;
+--error ER_INVALID_DEFAULT_PARAM
+EXECUTE IMMEDIATE 'SELECT * FROM t1 HAVING ?' USING IGNORE;
+EXECUTE IMMEDIATE 'SELECT * FROM t1 WHERE ?' USING 0;
+EXECUTE IMMEDIATE 'SELECT * FROM t1 HAVING ?' USING 0;
+DROP TABLE t1;
+--error ER_INVALID_DEFAULT_PARAM
+EXECUTE IMMEDIATE 'SHOW DATABASES WHERE ?' USING DEFAULT;
+EXECUTE IMMEDIATE 'SHOW DATABASES WHERE ?' USING 0;
+
 --echo #
 --echo # End of 10.2 tests
 --echo #

mysql-test/main/sp2.result

@@ -0,0 +1,20 @@
+CREATE DATABASE test1;
+CREATE PROCEDURE test1.sp3() BEGIN END;
+SHOW PROCEDURE STATUS;
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+mtr	add_suppression	PROCEDURE	root@localhost	#	#	DEFINER	utf8	utf8_general_ci	latin1_swedish_ci
+mtr	check_testcase	PROCEDURE	root@localhost	#	#	DEFINER	utf8	utf8_general_ci	latin1_swedish_ci
+mtr	check_warnings	PROCEDURE	root@localhost	#	#	DEFINER	utf8	utf8_general_ci	latin1_swedish_ci
+mysql	AddGeometryColumn	PROCEDURE	mariadb.sys@localhost	#	#	INVOKER	latin1	latin1_swedish_ci	latin1_swedish_ci
+mysql	DropGeometryColumn	PROCEDURE	mariadb.sys@localhost	#	#	INVOKER	latin1	latin1_swedish_ci	latin1_swedish_ci
+test	sp2	PROCEDURE	root@localhost	#	#	DEFINER	latin1	latin1_swedish_ci	latin1_swedish_ci
+test1	sp1	PROCEDURE	root@localhost	#	#	DEFINER	latin1	latin1_swedish_ci	latin1_swedish_ci
+test1	sp3	PROCEDURE	root@localhost	#	#	DEFINER	latin1	latin1_swedish_ci	latin1_swedish_ci
+DROP PROCEDURE sp2;
+DROP DATABASE test1;
+select count(*) from mysql.event;
+count(*)
+416
+flush tables;
+show events;
+truncate table mysql.event;

mysql-test/main/sp2.test

@@ -20,5 +20,8 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 SET @binlog_fragment_0='012345';
 BINLOG @binlog_fragment_0, @binlog_fragment_not_exist;
 ERROR 42000: Incorrect argument type to variable 'binlog_fragment_not_exist'
+SET @a= '42';
+BINLOG @a, @a;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use
 # Cleanup
 DROP TABLE t;

mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_frag.result

@@ -41,6 +41,11 @@ SET @binlog_fragment_0='012345';
 --error ER_WRONG_TYPE_FOR_VAR
 BINLOG @binlog_fragment_0, @binlog_fragment_not_exist;
 
+# MDEV-22520
+SET @a= '42';
+--error ER_SYNTAX_ERROR
+BINLOG @a, @a;
+
 --echo # Cleanup
 --remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql
 DROP TABLE t;

mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_frag.test

@@ -158,8 +158,9 @@ int binlog_defragment(THD *thd)
  memcpy(const_cast<char*>(thd->lex->comment.str) + gathered_length, entry[k]->value,
  entry[k]->length);
  gathered_length += entry[k]->length;
- update_hash(entry[k], true, NULL, 0, STRING_RESULT, &my_charset_bin, 0);
  }
+ for (uint k=0; k < 2; k++)
+ update_hash(entry[k], true, NULL, 0, STRING_RESULT, &my_charset_bin, 0);
 
  DBUG_ASSERT(gathered_length == thd->lex->comment.length);
 

sql/sql_binlog.cc

@@ -1970,7 +1970,9 @@ dict_index_remove_from_cache_low(
 ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
 ut_ad(mutex_own(&dict_sys.mutex));
 ut_ad(table->id);
+#ifdef BTR_CUR_HASH_ADAPT
 ut_ad(!index->freed());
+#endif /* BTR_CUR_HASH_ADAPT */
 
 /* No need to acquire the dict_index_t::lock here because
 there can't be any active operations on this index (or table). */

storage/innobase/dict/dict0dict.cc

@@ -1056,16 +1056,12 @@ struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
 @return whether the table will be rebuilt */
 bool need_rebuild () const { return(old_table != new_table); }
 
-/** Clear uncommmitted added indexes after a failed operation. */
-void clear_added_indexes()
-{
-for (ulint i = 0; i < num_to_add_index; i++) {
-if (!add_index[i]->is_committed()) {
-add_index[i]->detach_columns();
-add_index[i]->n_fields = 0;
-}
-}
-}
+ /** Clear uncommmitted added indexes after a failed operation. */
+ void clear_added_indexes()
+ {
+ for (ulint i= 0; i < num_to_add_index; i++)
+ add_index[i]->detach_columns(true);
+ }
 
 /** Convert table-rebuilding ALTER to instant ALTER. */
 void prepare_instant()