summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
diff options
context:
space:
mode:
authorlars@mysql.com/black.(none) <>2006-11-13 17:54:01 +0100
committerlars@mysql.com/black.(none) <>2006-11-13 17:54:01 +0100
commit7aa562ad2072e8e46c274de582beca3335906847 (patch)
treeeb8d5b16379b7f3f8441562d0056a1f68808395e /sql/sql_repl.cc
parentc5d56416bacaf69f5730ad0b970706fb45c15f42 (diff)
parentde01754c19c9eefff9a26975b7a232f82a123eb1 (diff)
downloadmariadb-git-7aa562ad2072e8e46c274de582beca3335906847.tar.gz
Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r--sql/sql_repl.cc6
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