diff options
| author | unknown <aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi> | 2006-11-08 09:57:20 +0200 |
|---|---|---|
| committer | unknown <aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi> | 2006-11-08 09:57:20 +0200 |
| commit | 6befbec8bcde3c4f1a19d8aac01304aadbfbcf69 (patch) | |
| tree | 36ae682f8721ab7ff11c298aaf4a872a14d095d5 /sql/sql_repl.cc | |
| parent | b227a3d3487802249408bb3edbc40d28e571b417 (diff) | |
| parent | 0f2fe8bde7ea13cb01b642291a9e4277f9bf0ad6 (diff) | |
| download | mariadb-git-6befbec8bcde3c4f1a19d8aac01304aadbfbcf69.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
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 2 |
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) { |