diff options
| -rw-r--r-- | mysql-test/include/restart_mysqld.inc | 4 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug12902967.test | 2 | ||||
| -rw-r--r-- | sql/log_event.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index 7cb9c7994d8..49f6dfd5364 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -14,8 +14,8 @@ if ($rpl_inited) --exec echo "wait" > $_expect_file_name # Send shutdown to the connected server and give -# it 10 seconds to die before zapping it -shutdown_server 10; +# it 60 seconds to die before zapping it +shutdown_server 60; # Write file to make mysql-test-run.pl start up the server again --exec echo "restart" > $_expect_file_name diff --git a/mysql-test/suite/innodb/t/innodb_bug12902967.test b/mysql-test/suite/innodb/t/innodb_bug12902967.test index 1183c4ceff6..8e1b8199524 100644 --- a/mysql-test/suite/innodb/t/innodb_bug12902967.test +++ b/mysql-test/suite/innodb/t/innodb_bug12902967.test @@ -24,7 +24,7 @@ alter table t1 add constraint c1 foreign key (f1) references t1(f1); perl; $file = $ENV{error_log}; open (FILE, '<', $file) or die "can't open(< $file): $!\n"; -print ((grep { /^InnoDB:/ and not /aio/i } <FILE>)[-2..-1]); +print ((grep { /^InnoDB:/ and not /aio/i and not /io_setup\(\) attempt [0-9]+ failed/ } <FILE>)[-2..-1]); EOF drop table t1; diff --git a/sql/log_event.cc b/sql/log_event.cc index f65d96eb9a8..f0b4ca5f8fc 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -6100,7 +6100,7 @@ Gtid_log_event::make_compatible_event(String *packet, bool *need_dummy_event, flags2= (*packet)[ev_offset + LOG_EVENT_HEADER_LEN + 12]; if (flags2 & FL_STANDALONE) { - if (need_dummy_event) + if (*need_dummy_event) return Query_log_event::dummy_event(packet, ev_offset, checksum_alg); else return 0; |