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 | db982ec87f53baf5b06b616a39a1f6cfb5f9262d (patch) | |
| tree | fe0f34a805e8f9f073f4eb3580604225e752e95a /sql/log_event.cc | |
| parent | d74c3df6ce335a5febbc49530b5e43625b68352d (diff) | |
| parent | a9ca9403a7264528ac4bd4e123532083bfaf7c0e (diff) | |
| download | mariadb-git-db982ec87f53baf5b06b616a39a1f6cfb5f9262d.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/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 47d1bef0eea..0c0d331a947 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1139,7 +1139,7 @@ failed my_b_read")); Log_event *res= 0; #ifndef max_allowed_packet THD *thd=current_thd; - uint max_allowed_packet= thd ? thd->variables.max_allowed_packet : ~(ulong)0; + uint max_allowed_packet= thd ? slave_max_allowed_packet:~(ulong)0; #endif if (data_len > max_allowed_packet) |