Merge branch '10.6.12' into 10.6

MariaDB · Feb 6, 2023 · 70a515d · 70a515d
2 parents 4c79e15 + 80ae69c
commit 70a515d
Show file tree

Hide file tree

Showing 17 changed files with 325 additions and 102 deletions.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=12
+MYSQL_VERSION_PATCH=13
 SERVER_MATURITY=stable
diff --git a/dbug/dbug.c b/dbug/dbug.c
@@ -86,7 +86,7 @@
 #include <m_string.h>
 #include <errno.h>
 #ifdef HAVE_gcov
-extern void __gcov_flush();
+#include <gcov.h>
 #endif
 
 #ifndef DBUG_OFF
@@ -2212,7 +2212,7 @@ void _db_suicide_()
   fprintf(stderr, "SIGKILL myself\n");
   fflush(stderr);
 #ifdef HAVE_gcov
-  __gcov_flush();
+  __gcov_dump();
 #endif
 
   retval= kill(getpid(), SIGKILL);
@@ -2262,7 +2262,7 @@ my_bool _db_my_assert(const char *file, int line, const char *msg)
     fprintf(stderr, "%s:%d: assert: %s\n", file, line, msg);
     fflush(stderr);
 #ifdef HAVE_gcov
-    __gcov_flush();
+    __gcov_dump();
 #endif
   }
   return a;

diff --git a/mysql-test/main/debug_sync.result b/mysql-test/main/debug_sync.result
@@ -2,7 +2,7 @@ SET DEBUG_SYNC= 'RESET';
 DROP TABLE IF EXISTS t1;
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: ''
+debug_sync	ON - current signals: ''
 SET DEBUG_SYNC='p0 SIGNAL s1 WAIT_FOR s2 TIMEOUT 6 EXECUTE 2 HIT_LIMIT 3';
 SET DEBUG_SYNC='p0 SIGNAL s1 WAIT_FOR s2 TIMEOUT 6 EXECUTE 2';
 SET DEBUG_SYNC='p0 SIGNAL s1 WAIT_FOR s2 TIMEOUT 6           HIT_LIMIT 3';
@@ -150,34 +150,34 @@ SET @myvar= 'now SIGNAL from_myvar';
 SET DEBUG_SYNC= @myvar;
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 'from_myvar'
+debug_sync	ON - current signals: 'from_myvar'
 SET DEBUG_SYNC= LEFT('now SIGNAL from_function_cut_here', 24);
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 'from_function'
+debug_sync	ON - current signals: 'from_myvar,from_function'
 SET DEBUG_SYNC= 'now SIGNAL something';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 'something'
+debug_sync	ON - current signals: 'something,from_function,from_myvar'
 SET DEBUG_SYNC= 'now WAIT_FOR nothing TIMEOUT 0';
 Warnings:
 Warning	####	debug sync point wait timed out
 SET DEBUG_SYNC= 'now SIGNAL nothing';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 'nothing'
+debug_sync	ON - current signals: 'something,from_function,nothing,from_myvar'
 SET DEBUG_SYNC= 'now WAIT_FOR nothing TIMEOUT 0';
 SET DEBUG_SYNC= 'now SIGNAL something EXECUTE 0';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 'nothing'
+debug_sync	ON - current signals: 'something,from_function,from_myvar'
 SET DEBUG_SYNC= 'now WAIT_FOR anotherthing TIMEOUT 0 EXECUTE 0';
 SET DEBUG_SYNC= 'now HIT_LIMIT 1';
 ERROR HY000: debug sync point hit limit reached
 SET DEBUG_SYNC= 'RESET';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: ''
+debug_sync	ON - current signals: ''
 SET DEBUG_SYNC= 'p1abcd   SIGNAL s1 EXECUTE 2';
 SET DEBUG_SYNC= 'p2abc    SIGNAL s2 EXECUTE 2';
 SET DEBUG_SYNC= 'p9abcdef SIGNAL s9 EXECUTE 2';
@@ -190,23 +190,30 @@ SET DEBUG_SYNC= 'p3abcdef SIGNAL s3 EXECUTE 2';
 SET DEBUG_SYNC= 'p4a      TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's4'
+debug_sync	ON - current signals: 's4'
 SET DEBUG_SYNC= 'p1abcd   TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's1'
+debug_sync	ON - current signals: 's4,s1'
 SET DEBUG_SYNC= 'p7       TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's7'
+debug_sync	ON - current signals: 's1,s7,s4'
 SET DEBUG_SYNC= 'p9abcdef TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's9'
+debug_sync	ON - current signals: 's1,s7,s4,s9'
 SET DEBUG_SYNC= 'p3abcdef TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's3'
+debug_sync	ON - current signals: 's1,s3,s4,s9,s7'
+SET DEBUG_SYNC= 'now WAIT_FOR s9';
+SET DEBUG_SYNC= 'now WAIT_FOR s1';
+SET DEBUG_SYNC= 'now WAIT_FOR s4';
+SET DEBUG_SYNC= 'now WAIT_FOR s7';
+SHOW VARIABLES LIKE 'DEBUG_SYNC';
+Variable_name	Value
+debug_sync	ON - current signals: 's3'
 SET DEBUG_SYNC= 'p1abcd   CLEAR';
 SET DEBUG_SYNC= 'p2abc    CLEAR';
 SET DEBUG_SYNC= 'p5abcde  CLEAR';
@@ -219,19 +226,19 @@ SET DEBUG_SYNC= 'p7       CLEAR';
 SET DEBUG_SYNC= 'p1abcd   TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's3'
+debug_sync	ON - current signals: 's3'
 SET DEBUG_SYNC= 'p7       TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's3'
+debug_sync	ON - current signals: 's3'
 SET DEBUG_SYNC= 'p9abcdef TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's3'
+debug_sync	ON - current signals: 's3'
 SET DEBUG_SYNC= 'RESET';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: ''
+debug_sync	ON - current signals: ''
 CREATE USER mysqltest_1@localhost;
 GRANT SUPER ON *.* TO mysqltest_1@localhost;
 connect  con1,localhost,mysqltest_1,,;
@@ -292,4 +299,24 @@ disconnect con1;
 disconnect con2;
 connection default;
 DROP TABLE t1;
+#
+# Test NO_CLEAR_EVENT flag. The signal should still be visible after
+# the wait has completed succesfully.
+#
+SET DEBUG_SYNC= 'now SIGNAL s1';
+SHOW VARIABLES LIKE 'DEBUG_SYNC';
+Variable_name	Value
+debug_sync	ON - current signals: 's1'
+SET DEBUG_SYNC= 'now WAIT_FOR s1 NO_CLEAR_EVENT';
+SHOW VARIABLES LIKE 'DEBUG_SYNC';
+Variable_name	Value
+debug_sync	ON - current signals: 's1'
+SET DEBUG_SYNC= 'now WAIT_FOR s1';
+SHOW VARIABLES LIKE 'DEBUG_SYNC';
+Variable_name	Value
+debug_sync	ON - current signals: ''
+SET DEBUG_SYNC= 'now SIGNAL s1,s2,s5,s7';
+SHOW VARIABLES LIKE 'DEBUG_SYNC';
+Variable_name	Value
+debug_sync	ON - current signals: 's2,s7,s1,s5'
 SET DEBUG_SYNC= 'RESET';
diff --git a/mysql-test/main/debug_sync.test b/mysql-test/main/debug_sync.test
@@ -298,6 +298,16 @@ SET DEBUG_SYNC= 'p9abcdef TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 SET DEBUG_SYNC= 'p3abcdef TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
+
+#
+# Wait for all signals currently active except s3.
+#
+SET DEBUG_SYNC= 'now WAIT_FOR s9';
+SET DEBUG_SYNC= 'now WAIT_FOR s1';
+SET DEBUG_SYNC= 'now WAIT_FOR s4';
+SET DEBUG_SYNC= 'now WAIT_FOR s7';
+SHOW VARIABLES LIKE 'DEBUG_SYNC';
+
 #
 # Clear the actions.
 #
@@ -320,7 +330,7 @@ SHOW VARIABLES LIKE 'DEBUG_SYNC';
 SET DEBUG_SYNC= 'p9abcdef TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 #
-# Now cleanup. Actions are clear already, but signal needs to be cleared.
+# Now cleanup. Actions are clear already, but s3 signal needs to be cleared.
 #
 SET DEBUG_SYNC= 'RESET';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
@@ -418,10 +428,24 @@ disconnect con2;
 connection default;
 DROP TABLE t1;
 
+--echo #
+--echo # Test NO_CLEAR_EVENT flag. The signal should still be visible after
+--echo # the wait has completed succesfully.
+--echo #
+SET DEBUG_SYNC= 'now SIGNAL s1';
+SHOW VARIABLES LIKE 'DEBUG_SYNC';
+SET DEBUG_SYNC= 'now WAIT_FOR s1 NO_CLEAR_EVENT';
+SHOW VARIABLES LIKE 'DEBUG_SYNC';
+SET DEBUG_SYNC= 'now WAIT_FOR s1';
+SHOW VARIABLES LIKE 'DEBUG_SYNC';
+
+SET DEBUG_SYNC= 'now SIGNAL s1,s2,s5,s7';
+SHOW VARIABLES LIKE 'DEBUG_SYNC';
+
+
 #
 # Cleanup after test case.
-# Otherwise signal would contain 'flushed' here,
-# which could confuse the next test.
+# Otherwise signal would confuse the next test.
 #
 SET DEBUG_SYNC= 'RESET';
 
diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
@@ -145,6 +145,7 @@ BEGIN
 my $start_only;
 my $file_wsrep_provider;
 my $num_saved_cores= 0;  # Number of core files saved in vardir/log/ so far.
+my $test_name_for_report;
 
 our @global_suppressions;
 
@@ -515,13 +516,13 @@ sub main {
   }
 
   if ( not @$completed ) {
-    my $test_name= mtr_grab_file($path_testlog);
-    $test_name =~ s/^CURRENT_TEST:\s//;
-    chomp($test_name);
-    my $tinfo = My::Test->new(name => $test_name);
-    $tinfo->{result}= 'MTR_RES_FAILED';
-    $tinfo->{comment}=' ';
-    mtr_report_test($tinfo);
+    if ($test_name_for_report)
+    {
+      my $tinfo = My::Test->new(name => $test_name_for_report);
+      $tinfo->{result}= 'MTR_RES_FAILED';
+      $tinfo->{comment}=' ';
+      mtr_report_test($tinfo);
+    }
     mtr_error("Test suite aborted");
   }
 
@@ -3740,8 +3741,8 @@ ($)
 sub run_testcase ($$) {
   my ($tinfo, $server_socket)= @_;
   my $print_freq=20;
-
-  mtr_verbose("Running test:", $tinfo->{name});
+  $test_name_for_report= $tinfo->{name};
+  mtr_verbose("Running test:", $test_name_for_report);
   $ENV{'MTR_TEST_NAME'} = $tinfo->{name};
   resfile_report_test($tinfo) if $opt_resfile;
 
@@ -5130,12 +5131,10 @@ ($$)
   if (!$rc)
   {
     # Report failure about the last test case before exit
-    my $test_name= mtr_grab_file($path_current_testlog);
-    $test_name =~ s/^CURRENT_TEST:\s//;
-    my $tinfo = My::Test->new(name => $test_name);
+    my $tinfo = My::Test->new(name => $test_name_for_report);
     $tinfo->{result}= 'MTR_RES_FAILED';
     $tinfo->{failures}= 1;
-    $tinfo->{logfile}=get_log_from_proc($mysqld->{'proc'}, $tinfo->{name});
+    $tinfo->{logfile}=get_log_from_proc($mysqld->{'proc'}, $test_name_for_report);
     report_option('verbose', 1);
     mtr_report_test($tinfo);
   }

diff --git a/mysql-test/suite/innodb/r/mdev-14846.result b/mysql-test/suite/innodb/r/mdev-14846.result
@@ -31,11 +31,12 @@ pk	f1	f2	f3
 3	t	q	1
 5	z	t	NULL
 SET DEBUG_SYNC='now SIGNAL default_dml';
+SET DEBUG_SYNC='now SIGNAL con2_dml';
 connection default;
 SET DEBUG_SYNC='now WAIT_FOR default_dml';
 UPDATE t3 AS alias1 LEFT JOIN t3 AS alias2 ON ( alias1.f1 <> alias1.f2 ) SET alias1.f3 = 59 WHERE ( EXISTS ( SELECT t1.f3 FROM t1 WHERE t1.f1 = alias1.f1 ) ) OR alias2.f1 = 'h';
 connect  con2,localhost,root,,test;
-set debug_sync='now WAIT_FOR default_dml';
+set debug_sync='now WAIT_FOR con2_dml';
 SET DEBUG_SYNC='now SIGNAL con1_dml2';
 disconnect con2;
 connection con1;

diff --git a/mysql-test/suite/innodb/t/mdev-14846.test b/mysql-test/suite/innodb/t/mdev-14846.test
@@ -35,14 +35,15 @@ SET DEBUG_SYNC='now WAIT_FOR con1_dml';
 begin;
 SELECT * FROM t1 for update; # Holds x lock of all records in the table t1
 SET DEBUG_SYNC='now SIGNAL default_dml';
+SET DEBUG_SYNC='now SIGNAL con2_dml';
 
 --connection default
 SET DEBUG_SYNC='now WAIT_FOR default_dml';
 --send UPDATE t3 AS alias1 LEFT JOIN t3 AS alias2 ON ( alias1.f1 <> alias1.f2 ) SET alias1.f3 = 59 WHERE ( EXISTS ( SELECT t1.f3 FROM t1 WHERE t1.f1 = alias1.f1 ) ) OR alias2.f1 = 'h'
 # It holds the lock of all record in t3 and tries to acquire record lock for the table  t1.
 
 --connect (con2,localhost,root,,test)
-set debug_sync='now WAIT_FOR default_dml';
+set debug_sync='now WAIT_FOR con2_dml';
 let $wait_condition=
 select count(*) > 0 from information_schema.innodb_lock_waits;
 --source include/wait_condition.inc

diff --git a/mysql-test/suite/stress/r/deadlock_drop_table.result b/mysql-test/suite/stress/r/deadlock_drop_table.result
@@ -19,11 +19,12 @@ a	b	c
 1	NULL	NULL
 set debug_sync='now SIGNAL go';
 set debug_sync='now WAIT_FOR parked2';
-set debug_sync='before_wait_for_refs SIGNAL waiting WAIT_FOR go2';
+set debug_sync='before_wait_for_refs SIGNAL waiting WAIT_FOR go3';
 drop table t1;;
 connection con2;
 set debug_sync='now WAIT_FOR waiting';
 set debug_sync='now SIGNAL go2';
+set debug_sync='now SIGNAL go3';
 connection default;
 connection con1;
 connection default;

diff --git a/mysql-test/suite/stress/t/deadlock_drop_table.test b/mysql-test/suite/stress/t/deadlock_drop_table.test
@@ -20,15 +20,12 @@ set debug_sync='now WAIT_FOR parked';
 select * from t1;
 set debug_sync='now SIGNAL go';
 set debug_sync='now WAIT_FOR parked2';
-set debug_sync='before_wait_for_refs SIGNAL waiting WAIT_FOR go2';
+set debug_sync='before_wait_for_refs SIGNAL waiting WAIT_FOR go3';
 --send drop table t1;
 --connection con2
 set debug_sync='now WAIT_FOR waiting';
 set debug_sync='now SIGNAL go2';
-
-# Write out show processlist if the debug sync point times out
-let $wait_condition= select count(*)=0 from information_schema.processlist where state like "%debug%";
-source include/wait_condition.inc;
+set debug_sync='now SIGNAL go3';
 
 --connection default
 --reap

diff --git a/mysql-test/suite/sys_vars/r/debug_sync_basic.result b/mysql-test/suite/sys_vars/r/debug_sync_basic.result
@@ -2,17 +2,17 @@ select @@global.debug_sync;
 ERROR HY000: Variable 'debug_sync' is a SESSION variable
 select @@session.debug_sync;
 @@session.debug_sync
-ON - current signal: ''
+ON - current signals: ''
 show global variables like "debug_sync";
 Variable_name	Value
 show session variables like "debug_sync";
 Variable_name	Value
-debug_sync	ON - current signal: ''
+debug_sync	ON - current signals: ''
 select * from information_schema.global_variables where variable_name="debug_sync";
 VARIABLE_NAME	VARIABLE_VALUE
 select * from information_schema.session_variables where variable_name="debug_sync";
 VARIABLE_NAME	VARIABLE_VALUE
-DEBUG_SYNC	ON - current signal: ''
+DEBUG_SYNC	ON - current signals: ''
 set @@session.debug_sync=1;
 ERROR 42000: Incorrect argument type to variable 'debug_sync'
 set @@session.debug_sync=1.1;

diff --git a/mysql-test/suite/sys_vars/r/sysvars_debug.result b/mysql-test/suite/sys_vars/r/sysvars_debug.result
@@ -77,7 +77,7 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	OPTIONAL
 GLOBAL_VALUE_PATH	NULL
 VARIABLE_NAME	DEBUG_SYNC
-SESSION_VALUE	ON - current signal: ''
+SESSION_VALUE	ON - current signals: ''
 GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	

diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c
@@ -34,6 +34,9 @@
 #include <execinfo.h>
 #endif
 
+#ifdef HAVE_gcov
+#include <gcov.h>
+#endif
 /**
    Default handler for printing stacktrace
 */
@@ -409,17 +412,14 @@ void my_print_stacktrace(uchar* stack_bottom, ulong thread_stack,
 /* Produce a core for the thread */
 void my_write_core(int sig)
 {
-#ifdef HAVE_gcov
-  extern void __gcov_flush(void);
-#endif
   signal(sig, SIG_DFL);
 #ifdef HAVE_gcov
   /*
     For GCOV build, crashing will prevent the writing of code coverage
     information from this process, causing gcov output to be incomplete.
     So we force the writing of coverage information here before terminating.
   */
-  __gcov_flush();
+  __gcov_dump();
 #endif
   pthread_kill(pthread_self(), sig);
 #if defined(P_MYID) && !defined(SCO)