auto-merge

mysql-test/include/not_binlog_format_row.inc

+if (`SELECT @@binlog_format = 'ROW'`)
+{
+     skip Test cannot run with binlog_format row;
+}

mysql-test/lib/My/ConfigFactory.pm

@@ -356,6 +356,8 @@ sub post_check_client_group {
   }
   
   if (IS_WINDOWS)
+  {
+    if (! $self->{ARGS}->{embedded})
     {
       # Shared memory base may or may not be defined (e.g not defined in embedded)
       my $shm = $group_to_copy_from->option("shared-memory-base-name");
@@ -364,6 +366,7 @@ sub post_check_client_group {
         $config->insert($client_group_name,"shared-memory-base-name", $shm->value());
       }
     }
+  }
 }
 
 

mysql-test/r/bug39022.result

@@ -28,5 +28,5 @@ SELECT d FROM t2,t1 WHERE d=(SELECT MAX(a) FROM t1 WHERE t1.a > t2.d);
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 # in thread2
 d
-# in default
+# in thread1;
 DROP TABLE t1,t2;

mysql-test/t/bug39022.test

 -- source include/have_log_bin.inc
 -- source include/have_innodb.inc
+-- source include/not_binlog_format_row.inc
 
 --echo #
 --echo # Bug #39022: Mysql randomly crashing in lock_sec_rec_cons_read_sees
@@ -49,10 +50,14 @@ connection thread2;
 --echo # in thread2
 REAP;
 
-connection default;
---echo # in default
+disconnect thread2;
+--source include/wait_until_disconnected.inc
 
+connection thread1;
+--echo # in thread1;
 disconnect thread1;
-disconnect thread2;
+--source include/wait_until_disconnected.inc
+
+connection default;
 
 DROP TABLE t1,t2;