5.5. merge

This commit is contained in:
Sergei Golubchik 2013-11-13 14:07:58 +01:00
commit bdd883ed9a
51 changed files with 487 additions and 145 deletions

View file

@ -328,7 +328,7 @@ rpl_slave_state::record_gtid(THD *thd, const rpl_gtid *gtid, uint64 sub_id,
}
if (!in_statement)
mysql_reset_thd_for_next_command(thd, 0);
mysql_reset_thd_for_next_command(thd);
DBUG_EXECUTE_IF("gtid_inject_record_gtid",
{