summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorManish Kumar <manish.4.kumar@oracle.com>2012-06-12 12:59:56 +0530
committerManish Kumar <manish.4.kumar@oracle.com>2012-06-12 12:59:56 +0530
commitdb982ec87f53baf5b06b616a39a1f6cfb5f9262d (patch)
treefe0f34a805e8f9f073f4eb3580604225e752e95a /sql/mysqld.cc
parentd74c3df6ce335a5febbc49530b5e43625b68352d (diff)
parenta9ca9403a7264528ac4bd4e123532083bfaf7c0e (diff)
downloadmariadb-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/mysqld.cc')
-rw-r--r--sql/mysqld.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index df9fbaa8652..90fd1f1e126 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -469,6 +469,7 @@ ulonglong slave_type_conversions_options;
ulong thread_cache_size=0;
ulong binlog_cache_size=0;
ulonglong max_binlog_cache_size=0;
+ulong slave_max_allowed_packet= 0;
ulong binlog_stmt_cache_size=0;
ulonglong max_binlog_stmt_cache_size=0;
ulong query_cache_size=0;