diff options
author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-09-17 12:31:38 +0300 |
---|---|---|
committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-09-17 12:31:38 +0300 |
commit | 7b791250a1d2f293da83533fc332fd1d80f665a1 (patch) | |
tree | 85f8b21478422a123a8b128ffd471b98a53150c4 /sql/mysqld.h | |
parent | f4862acfc389864f99100f66abe905c1f5be9e80 (diff) | |
parent | 6f94b5c76d51e655d36198d177972caa18089e31 (diff) | |
download | mariadb-git-7b791250a1d2f293da83533fc332fd1d80f665a1.tar.gz |
References lp:1051808 - merged with lp:maria/5.5
bzr merge lp:maria/5.5
...
Text conflict in CMakeLists.txt
Text conflict in sql/mysqld.cc
Text conflict in sql/sql_class.h
Text conflict in sql/sql_truncate.cc
4 conflicts encountered.
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r-- | sql/mysqld.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 9ce53555e45..07beda50e42 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -174,10 +174,12 @@ extern ulong open_files_limit; extern ulonglong binlog_cache_size, binlog_stmt_cache_size; extern ulonglong max_binlog_cache_size, max_binlog_stmt_cache_size; extern ulong max_binlog_size, max_relay_log_size; +extern ulong slave_max_allowed_packet; extern ulong opt_binlog_rows_event_max_size; extern ulong rpl_recovery_rank, thread_cache_size; extern ulong stored_program_cache_size; extern ulong back_log; +extern ulong executed_events; extern char language[FN_REFLEN]; extern "C" MYSQL_PLUGIN_IMPORT ulong server_id; extern ulong concurrency; |