diff options
| author | unknown <hezx@mail.hezx.com> | 2007-12-21 17:52:25 +0800 |
|---|---|---|
| committer | unknown <hezx@mail.hezx.com> | 2007-12-21 17:52:25 +0800 |
| commit | 76159fdfcc6b6db71a44d1c9be6b3594fe76393c (patch) | |
| tree | ac31e4871eef080d1a1d814dadc1038b36744f3c /sql | |
| parent | e2937d7f430414607bbf8a56e5617b26e1fabdb3 (diff) | |
| parent | 9d7c0dda3145fdb28d86759ae80c7a9eba4d98cc (diff) | |
| download | mariadb-git-76159fdfcc6b6db71a44d1c9be6b3594fe76393c.tar.gz | |
Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.0-rpl
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 5 |
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 /* |