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/sys_vars.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/sys_vars.cc')
-rw-r--r-- | sql/sys_vars.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index f15664bca10..e0523989f9d 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -45,6 +45,7 @@ #include "derror.h" // read_texts #include "sql_base.h" // close_cached_tables +#include "log_event.h" #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE #include "../storage/perfschema/pfs_server.h" #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */ @@ -1131,6 +1132,14 @@ static Sys_var_ulong Sys_max_allowed_packet( BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_max_allowed_packet)); +static Sys_var_ulong Sys_slave_max_allowed_packet( + "slave_max_allowed_packet", + "The maximum packet length to sent successfully from the master to slave.", + GLOBAL_VAR(slave_max_allowed_packet), CMD_LINE(REQUIRED_ARG), + VALID_RANGE(1024, MAX_MAX_ALLOWED_PACKET), + DEFAULT(MAX_MAX_ALLOWED_PACKET), + BLOCK_SIZE(1024)); + static Sys_var_ulonglong Sys_max_binlog_cache_size( "max_binlog_cache_size", "Sets the total size of the transactional cache", |