database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-22 17:44:29 +03:00
Code Activity

MWL#116: Efficient group commit: Some fixes for test failures.

Browse Source 
client/mysqltest.cc:
  Apply Serg's work-around for MySQL BUG#57491.
mysql-test/r/group_commit_binlog_pos.result:
  Accept different ways the server crash is detected.
mysql-test/t/group_commit_binlog_pos.test:
  Accept different ways the server crash is detected.
  Skip in row-based binlogging, as otherwise the binlog offsets will be different.
This commit is contained in:
unknown
2010-10-23 11:50:02 +02:00
parent 45131a5b10
commit f0707b38ea
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysqltest.cc
View File

@@ -717,6 +717,10 @@ void handle_no_error(struct st_command*);
#ifdef EMBEDDED_LIBRARY #ifdef EMBEDDED_LIBRARY
/* workaround for MySQL BUG#57491 */
#undef MY_WME
#define MY_WME 0
/* attributes of the query thread */ /* attributes of the query thread */
pthread_attr_t cn_thd_attrib; pthread_attr_t cn_thd_attrib;

6
mysql-test/r/group_commit_binlog_pos.result
View File

@@ -21,9 +21,9 @@ a
2 2
SET SESSION debug="+d,crash_dispatch_command_before"; SET SESSION debug="+d,crash_dispatch_command_before";
SELECT 1; SELECT 1;
ERROR HY000: Lost connection to MySQL server during query Got one of the listed errors
ERROR HY000: Lost connection to MySQL server during query Got one of the listed errors
ERROR HY000: Lost connection to MySQL server during query Got one of the listed errors
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
a a
0 0

8
mysql-test/t/group_commit_binlog_pos.test
View File

@@ -1,6 +1,8 @@
--source include/have_debug_sync.inc --source include/have_debug_sync.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_log_bin.inc --source include/have_log_bin.inc
--source include/have_binlog_format_mixed_or_statement.inc
# Need DBUG to crash the server intentionally # Need DBUG to crash the server intentionally
--source include/have_debug.inc --source include/have_debug.inc
# Don't test this under valgrind, memory leaks will occur as we crash # Don't test this under valgrind, memory leaks will occur as we crash
@@ -54,14 +56,14 @@ reap;
connection default; connection default;
system echo wait-group_commit_binlog_pos.test >> $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; system echo wait-group_commit_binlog_pos.test >> $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
SET SESSION debug="+d,crash_dispatch_command_before"; SET SESSION debug="+d,crash_dispatch_command_before";
--error 2013 --error 2006,2013
SELECT 1; SELECT 1;
connection con1; connection con1;
--error 2013 --error 2006,2013
reap; reap;
connection con3; connection con3;
--error 2013 --error 2006,2013
reap; reap;
system echo restart-group_commit_binlog_pos.test >> $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; system echo restart-group_commit_binlog_pos.test >> $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;