summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
diff options
context:
space:
mode:
authoraelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi <>2006-11-08 09:57:20 +0200
committeraelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi <>2006-11-08 09:57:20 +0200
commit7425499e8e52066e877585f343c8ef1123d1e3ea (patch)
tree36ae682f8721ab7ff11c298aaf4a872a14d095d5 /sql/sql_repl.cc
parentdb8aa4ab6c562a14f77aac3ff4d3af2218327add (diff)
parentb4b06d7a67ca31c2d52a5e60fe900be654947948 (diff)
downloadmariadb-git-7425499e8e52066e877585f343c8ef1123d1e3ea.tar.gz
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/4.1/bug19402-max_allowed
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-4.1-rpl
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r--sql/sql_repl.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 2a7ab55b8c4..5ac1d94b097 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -420,6 +420,8 @@ impossible position";
goto err;
}
packet->set("\0", 1, &my_charset_bin);
+ /* dump thread the whole header size of query_log_event */
+ thd->variables.max_allowed_packet+= MAX_LOG_EVENT_HEADER;
while (!net->error && net->vio != 0 && !thd->killed)
{