summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <mats@capulet.kindahl.net>2007-12-21 07:52:07 +0100
committerunknown <mats@capulet.kindahl.net>2007-12-21 07:52:07 +0100
commit9d7c0dda3145fdb28d86759ae80c7a9eba4d98cc (patch)
tree9a49a0002787aef71957435179bfbae7a4cb2b19 /sql
parent590350633c23d3d986e9d3c8745aa8f0bbb78105 (diff)
parent150590a0bce917f7747765e1589fa37efa09fb53 (diff)
downloadmariadb-git-9d7c0dda3145fdb28d86759ae80c7a9eba4d98cc.tar.gz
Merge capulet.kindahl.net:/home/mats/devel/b12691-mysql-5.0-rpl
into capulet.kindahl.net:/home/mats/devel/fix-mysql-5.0-rpl
Diffstat (limited to 'sql')
-rw-r--r--sql/slave.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 1509916fe91..4a65e9aaa85 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -3348,7 +3348,10 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli)
if (rli->slave_skip_counter &&
!((type_code == INTVAR_EVENT ||
type_code == RAND_EVENT ||
- type_code == USER_VAR_EVENT) &&
+ type_code == USER_VAR_EVENT ||
+ type_code == BEGIN_LOAD_QUERY_EVENT ||
+ type_code == APPEND_BLOCK_EVENT ||
+ type_code == CREATE_FILE_EVENT) &&
rli->slave_skip_counter == 1) &&
#if MYSQL_VERSION_ID < 50100
/*