Commit ab6feabb authored by Tatiana A. Nurnberg's avatar Tatiana A. Nurnberg

auto-merge

parents ecf4ba96 13d7179a
if (`SELECT @@binlog_format = 'ROW'`)
{
skip Test cannot run with binlog_format row;
}
......@@ -357,11 +357,14 @@ sub post_check_client_group {
if (IS_WINDOWS)
{
# 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");
if (defined $shm)
if (! $self->{ARGS}->{embedded})
{
$config->insert($client_group_name,"shared-memory-base-name", $shm->value());
# 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");
if (defined $shm)
{
$config->insert($client_group_name,"shared-memory-base-name", $shm->value());
}
}
}
}
......
......@@ -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;
-- 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;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment