Merge 10.5 into 10.6

mysql-test/suite/plugins/r/fulltext_plugin.result

@@ -1,3 +1,6 @@
+#
+# BUG#39746 - Debug flag breaks struct definition (server crash)
+#
 INSTALL PLUGIN simple_parser SONAME 'mypluglib.so';
 CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a) WITH PARSER simple_parser);
 ALTER TABLE t1 ADD FULLTEXT(b) WITH PARSER simple_parser;
@@ -5,3 +8,11 @@ DROP TABLE t1;
 UNINSTALL PLUGIN simple_parser;
 show status like 'a%status';
 Variable_name	Value
+#
+# MDEV-35050 Found wrong usage of mutex upon setting plugin session variables
+#
+install soname 'mypluglib';
+set session_track_system_variables="*";
+set session simple_parser_simple_thdvar_one = 10;
+uninstall soname 'mypluglib';
+# End of 10.5 tests

mysql-test/suite/plugins/t/feedback_plugin_load.test

@@ -18,7 +18,9 @@ select plugin_status from information_schema.plugins where plugin_name='feedback
 # so lets get back to it if it ever happens.
 
 # Lets say the plugin was used X times before this SELECT
+--disable_cursor_protocol
 SELECT variable_value INTO @feedback_used FROM information_schema.feedback where variable_name = 'FEEDBACK used';
+--enable_cursor_protocol
 
 # Now $feedback_used == X+1, and 'FEEDBACK used' is also X+1. And variable_value is increased again when we run the next SELECT
 SELECT variable_value = @feedback_used + 1 as 'MUST BE 1' FROM information_schema.feedback where variable_name = 'FEEDBACK used';

mysql-test/suite/plugins/t/fulltext_plugin.test

@@ -1,8 +1,8 @@
 --source include/have_simple_parser.inc
 
-#
-# BUG#39746 - Debug flag breaks struct definition (server crash)
-#
+--echo #
+--echo # BUG#39746 - Debug flag breaks struct definition (server crash)
+--echo #
 --replace_result .dll .so
 eval INSTALL PLUGIN simple_parser SONAME '$MYPLUGLIB_SO';
 CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a) WITH PARSER simple_parser);
@@ -15,3 +15,12 @@ UNINSTALL PLUGIN simple_parser;
 #
 show status like 'a%status';
 
+--echo #
+--echo # MDEV-35050 Found wrong usage of mutex upon setting plugin session variables
+--echo #
+install soname 'mypluglib';
+set session_track_system_variables="*";
+set session simple_parser_simple_thdvar_one = 10;
+uninstall soname 'mypluglib';
+
+--echo # End of 10.5 tests

mysql-test/suite/plugins/t/qc_info.test

@@ -4,10 +4,12 @@ set @save_query_cache_size=@@global.query_cache_size;
 
 # test that hits are correctly incremented
 reset query cache;
+--disable_cursor_protocol
 --disable_ps2_protocol
 select * from t1;
 select * from t1;
 --enable_ps2_protocol
+--enable_cursor_protocol
 select hits, statement_text from information_schema.query_cache_info;
 
 drop table t1;

mysql-test/suite/plugins/t/qc_info_init.inc

@@ -9,11 +9,14 @@ set global query_cache_size=1355776;
 
 create table t1 (a int not null);
 insert into t1 values (1),(2),(3);
+--disable_cursor_protocol
 --disable_ps2_protocol
 select * from t1;
 --enable_ps2_protocol
+--enable_cursor_protocol
 select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_info;
 
+--disable_cursor_protocol
 select @@time_zone into @time_zone;
 select @@default_week_format into @default_week_format;
 select @@character_set_client into @character_set_client;
@@ -32,6 +35,7 @@ select * from t1;
 --enable_ps2_protocol
 --enable_result_log
 set time_zone= @time_zone, default_week_format= @default_week_format, character_set_client= @character_set_client,character_set_results= @character_set_results, sql_mode= @sql_mode, div_precision_increment= @div_precision_increment, lc_time_names= @lc_time_names, autocommit= @autocommit, group_concat_max_len= @group_concat_max_len, max_sort_length= @max_sort_length;
+--enable_cursor_protocol
 
 --sorted_result
 --replace_column 5 # 20 # 24 #