Merge branch '10.6' into 10.11

mysql-test/include/commit.inc

@@ -613,13 +613,17 @@ call p_verify_status_increment(2, 0, 2, 0);
 drop table t2;
 set sql_mode=no_engine_substitution;
 create temporary table t2 (a int);
-call p_verify_status_increment(1, 0, 0, 0);
+# One commit for the create temporary table, and two for committing the
+# read of the stored procedure from Aria table (creating temporary table
+# clears the sp cache).
+call p_verify_status_increment(3, 0, 2, 0);
 set sql_mode=default;
 --echo # 19. A function changes temp-trans-table.
 --echo #
 select f1();
---echo # Two commits because a binary log record is written
-call p_verify_status_increment(2, 0, 1, 0);
+--echo # Two commits because a binary log record is written, and another two
+--echo # as the function f1() is reloaded after creating temporary table.
+call p_verify_status_increment(4, 0, 3, 0);
 commit;
 call p_verify_status_increment(2, 0, 1, 0);
 
@@ -672,9 +676,11 @@ call p_verify_status_increment(2, 0, 1, 0);
 --echo # 25. DDL: DROP TEMPORARY TABLE, does not start a transaction
 --echo #
 drop temporary table t2;
-call p_verify_status_increment(1, 0, 1, 0);
+# Dropping temporary table clears SP caches, so get another two commit
+# increments from loading the p_verify_status_increment procedure.
+call p_verify_status_increment(3, 0, 2, 0);
 commit;
-call p_verify_status_increment(1, 0, 1, 0);
+call p_verify_status_increment(1, 0, 0, 0);
 
 --echo # 26. Verify that SET AUTOCOMMIT issues an implicit commit
 --echo #
@@ -721,7 +727,9 @@ call p_verify_status_increment(1, 0, 1, 0);
 create table t2 (a int);
 call p_verify_status_increment(0, 0, 0, 0);
 do (select f1() from t1 where a=2);
-call p_verify_status_increment(2, 2, 2, 2);
+# Again extra 2 commit increments from re-loading function f1 after
+# dropping temporary table.
+call p_verify_status_increment(4, 2, 4, 2);
 commit;
 call p_verify_status_increment(2, 2, 2, 2);
 

mysql-test/include/crash_mysqld.inc

@@ -4,7 +4,7 @@
 --source include/not_embedded.inc
 
 # Write file to make mysql-test-run.pl expect crash and restart
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--write_line restart $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
 # Setup the mysqld to crash at shutdown
 SET debug_dbug="d,crash_shutdown";

mysql-test/include/default_mysqld.cnf

@@ -91,7 +91,7 @@ loose-performance-schema-events-statements-history-size=10
 loose-performance-schema-events-statements-history-long-size=1000
 loose-performance-schema-events-transactions-history-size=10
 loose-performance-schema-events-transactions-history-long-size=1000
-loose-performance-schema-max-thread-instances=200
+loose-performance-schema-max-thread-instances=400
 loose-performance-schema-session-connect-attrs-size=2048
 loose-performance-schema-max-metadata-locks=10000
 

mysql-test/include/expect_crash.inc

@@ -2,4 +2,4 @@
 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/$_expect_file_name.expect
 
 # There should be a debug crash after using this .inc file
---exec echo "wait" > $_expect_file_name
+--write_line wait $_expect_file_name

mysql-test/include/kill_and_restart_mysqld.inc

@@ -7,7 +7,7 @@ if (!$restart_parameters)
 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
 
 --echo # Kill and $restart_parameters
---exec echo "$restart_parameters" > $_expect_file_name
+--write_line "$restart_parameters" $_expect_file_name
 --shutdown_server 0
 --source include/wait_until_disconnected.inc
 --enable_reconnect

mysql-test/include/kill_galera.inc

@@ -3,7 +3,7 @@
 # Write file to make mysql-test-run.pl expect the crash, but don't start it
 --let $_expect_file_name= `select regexp_replace(@@tmpdir, '^.*/','')`
 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/$_expect_file_name.expect
---exec echo "wait" > $_expect_file_name
+--write_line wait $_expect_file_name
 
 # Kill the connected server
 --disable_reconnect

mysql-test/include/kill_mysqld.inc

@@ -2,6 +2,6 @@
 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/$_expect_file_name.expect
 
 --echo # Kill the server
---exec echo "wait" > $_expect_file_name
+--write_line wait $_expect_file_name
 --shutdown_server 0
 --source include/wait_until_disconnected.inc

mysql-test/include/rpl_change_topology.inc

@@ -96,10 +96,11 @@
 # Remove whitespace from $rpl_topology
 --let $rpl_topology= `SELECT REPLACE('$rpl_topology', ' ', '')`
 
+--source include/slow_environ.inc
+
 --let $include_filename= rpl_change_topology.inc [new topology=$rpl_topology]
 --source include/begin_include_file.inc
 
-
 if ($rpl_debug)
 {
   --echo ---- Check input ----
@@ -235,11 +236,11 @@ if (!$rpl_skip_change_master)
       }
       if ($rpl_master_log_file)
       {
-        eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', MASTER_PORT = $_rpl_port, MASTER_USER = 'root', MASTER_LOG_FILE = '$_rpl_master_log_file'$_rpl_master_log_pos, MASTER_CONNECT_RETRY = 1, MASTER_USE_GTID=NO;
+        eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', MASTER_PORT = $_rpl_port, MASTER_USER = 'root', MASTER_LOG_FILE = '$_rpl_master_log_file'$_rpl_master_log_pos, MASTER_CONNECT_RETRY = 1$_timeout_adjustment, MASTER_USE_GTID=NO;
       }
       if (!$rpl_master_log_file)
       {
-        eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', MASTER_PORT = $_rpl_port, MASTER_USER = 'root', MASTER_CONNECT_RETRY=1;
+        eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', MASTER_PORT = $_rpl_port, MASTER_USER = 'root', MASTER_CONNECT_RETRY=1$_timeout_adjustment;
       }
     }
     if ($_rpl_master == '')

mysql-test/include/rpl_start_server.inc

@@ -49,7 +49,7 @@ if ($rpl_server_parameters)
 --source include/rpl_connection.inc
 
 # Write file to make mysql-test-run.pl start up the server again
---exec echo "$_rpl_start_server_command" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
+--write_line "$_rpl_start_server_command"  $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
 
 if (!$rpl_server_error)
 {

mysql-test/include/rpl_stop_server.inc

@@ -44,7 +44,7 @@ if ($rpl_debug)
 
 # Write file to make mysql-test-run.pl expect the "crash", but don't start
 # it until it's told to
---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
+--write_line wait $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
 
 # Send shutdown to the connected server and give
 # it 60 seconds (of mysqltest's default) to die before zapping it

mysql-test/include/search_pattern_in_file.inc

@@ -36,7 +36,7 @@
 #    let SEARCH_FILE= $error_log;
 #    # Stop the server
 #    let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
-#    --exec echo "wait" > $restart_file
+#    --write_line wait $restart_file
 #    --shutdown_server
 #    --source include/wait_until_disconnected.inc
 #

mysql-test/include/shutdown_mysqld.inc

@@ -24,18 +24,15 @@ if ($rpl_inited)
 # Write file to make mysql-test-run.pl expect the "crash", but don't start it
 --let $_expect_file_name= `select regexp_replace(@@tmpdir, '^.*/','')`
 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/$_expect_file_name.expect
---exec echo "wait" > $_expect_file_name
+--write_line wait $_expect_file_name
 
 # Avoid warnings from connection threads that does not have time to exit
 --disable_query_log
 set @@global.log_warnings=0;
 --enable_query_log
 
---let $server_shutdown_timeout= 60
-if ($VALGRIND_TEST)
-{
-  --let $server_shutdown_timeout= 300
-}
+--source include/slow_environ.inc
+--let $server_shutdown_timeout= 60$_timeout_adjustment
 
 if ($shutdown_timeout)
 {

mysql-test/include/slow_environ.inc

@@ -0,0 +1,9 @@
+if (!$slow_environ_check)
+{
+  let $_timeout_adjustment=;
+  if (`select $VALGRIND_TEST + count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like '%SAN%'`)
+  {
+    let $_timeout_adjustment=0;
+  }
+  let $slow_environ_check=1;
+}

mysql-test/include/start_mysqld.inc

@@ -21,7 +21,7 @@ if ($restart_bindir)
 
 if ($restart_parameters)
 {
-  --exec echo "$restart_cmd: $restart_parameters" > $_expect_file_name
+  --write_line "$restart_cmd: $restart_parameters" $_expect_file_name
   if (!$restart_noprint)
   {
     --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
@@ -34,7 +34,7 @@ if ($restart_parameters)
 }
 if (!$restart_parameters)
 {
-  --exec echo "$restart_cmd" > $_expect_file_name
+  --write_line "$restart_cmd" $_expect_file_name
   if ($restart_noprint < 2)
   {
     --exec echo "# $restart_cmd"

mysql-test/include/stop_slave_io.inc

@@ -34,8 +34,17 @@ if (!$rpl_debug)
   --disable_query_log
 }
 
-
+let $_enable_warnings=0;
+if ($rpl_allow_error) {
+  if ($ENABLED_WARNINGS) {
+    let $_enable_warnings=1;
+    disable_warnings;
+  }
+}
 STOP SLAVE IO_THREAD;
+if ($_enable_warnings) {
+  enable_warnings;
+}
 --source include/wait_for_slave_io_to_stop.inc
 
 

mysql-test/include/sync_slave_sql_with_io.inc

@@ -25,11 +25,8 @@
 let $_slave_timeout= $slave_timeout;
 if (!$_slave_timeout)
 {
-  let $_slave_timeout= 300;
-  if ($VALGRIND_TEST)
-  {
-    let $_slave_timeout= 1500;
-  }
+  source include/slow_environ.inc;
+  let $_slave_timeout= 300$_timeout_adjustment;
 }
 
 --let $_master_log_file= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1)

mysql-test/include/sync_with_master_gtid.inc

@@ -33,11 +33,8 @@
 let $_slave_timeout= $slave_timeout;
 if (!$_slave_timeout)
 {
-  let $_slave_timeout= 120;
-  if ($VALGRIND_TEST)
-  {
-    let $_slave_timeout= 1200;
-  }
+  source include/slow_environ.inc;
+  let $_slave_timeout= 120$_timeout_adjustment;
 }
 
 --let $_result= `SELECT master_gtid_wait('$master_pos', $_slave_timeout)`

mysql-test/include/wait_for_slave_param.inc

@@ -49,11 +49,8 @@
 let $_slave_timeout= $slave_timeout;
 if (!$_slave_timeout)
 {
-  let $_slave_timeout= 300;
-  if ($VALGRIND_TEST)
-  {
-    let $_slave_timeout= 1500;
-  }
+  source include/slow_environ.inc;
+  let $_slave_timeout= 300$_timeout_adjustment;
 }
 
 let $_slave_param_comparison= $slave_param_comparison;