1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-merge

Browse Source
This commit is contained in:
Tatiana A. Nurnberg 2010-02-20 16:30:10 +00:00
commit ab6feabb6f
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/not_binlog_format_row.inc Normal file
View File

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

3
mysql-test/lib/My/ConfigFactory.pm
View File

@ -356,6 +356,8 @@ sub post_check_client_group {
} }
if (IS_WINDOWS) if (IS_WINDOWS)
{
if (! $self->{ARGS}->{embedded})
{ {
# Shared memory base may or may not be defined (e.g not defined in 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"); my $shm = $group_to_copy_from->option("shared-memory-base-name");
@ -365,6 +367,7 @@ sub post_check_client_group {
} }
} }
} }
}
sub post_check_client_groups { sub post_check_client_groups {

2
mysql-test/r/bug39022.result
View File

@ -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 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
# in thread2 # in thread2
d d
# in default # in thread1;
DROP TABLE t1,t2; DROP TABLE t1,t2;

13
mysql-test/t/bug39022.test
View File

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