diff options
| author | unknown <lars@mysql.com/black.(none)> | 2006-11-13 17:54:01 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com/black.(none)> | 2006-11-13 17:54:01 +0100 |
| commit | 1613ad2c9836f83d366ca9d6d3aaff741262842c (patch) | |
| tree | eb8d5b16379b7f3f8441562d0056a1f68808395e /sql/sql_repl.cc | |
| parent | 181c9b4dd4c23c5ef4d8c2562c055e35b6267bfe (diff) | |
| parent | 8fd48ccec01350f65c280cd754aac34d89609fab (diff) | |
| download | mariadb-git-1613ad2c9836f83d366ca9d6d3aaff741262842c.tar.gz | |
Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/log_event.h:
Manual merge
sql/slave.cc:
Manual merge
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index e1933d42f9e..120092c2a07 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -430,6 +430,12 @@ impossible position"; goto err; } packet->set("\0", 1, &my_charset_bin); + /* + Adding MAX_LOG_EVENT_HEADER_LEN, since a binlog event can become + this larger than the corresponding packet (query) sent + from client to master. + */ + thd->variables.max_allowed_packet+= MAX_LOG_EVENT_HEADER; /* We can set log_lock now, it does not move (it's a member of |