diff options
| author | Manish Kumar <manish.4.kumar@oracle.com> | 2012-06-12 12:59:56 +0530 |
|---|---|---|
| committer | Manish Kumar <manish.4.kumar@oracle.com> | 2012-06-12 12:59:56 +0530 |
| commit | 46ca66b9f85e6c74532b52da688b3bce970c08d2 (patch) | |
| tree | fe0f34a805e8f9f073f4eb3580604225e752e95a /sql/sql_repl.cc | |
| parent | 4f106324c1321264af256a738c8bf423a95ef0d4 (diff) | |
| parent | 6c03d09e2e96bed671675f1882e6ab1ff821d50c (diff) | |
| download | mariadb-git-46ca66b9f85e6c74532b52da688b3bce970c08d2.tar.gz | |
BUG#12400221 - 60926: BINARY LOG EVENTS LARGER THAN MAX_ALLOWED_PACKET
Upmerge from mysql-5.1 -> mysql-5.5
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 5968c17f871..16b6a7594eb 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -588,7 +588,7 @@ impossible position"; this larger than the corresponding packet (query) sent from client to master. */ - thd->variables.max_allowed_packet+= MAX_LOG_EVENT_HEADER; + thd->variables.max_allowed_packet= MAX_MAX_ALLOWED_PACKET; /* We can set log_lock now, it does not move (it's a member of |