summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-09-22 17:11:40 +0300
committerMichael Widenius <monty@askmonty.org>2012-09-22 17:11:40 +0300
commit620d14f8c3521f9ec7283b8690e0e16434739d33 (patch)
treeb3438fd90e14b3be2ec21e53cca37cd795090a00 /sql/mysqld.h
parent288eeb3a31e4bfb52180f3906a4d354ac9cc457e (diff)
parent3e83c4e8f90851040be921443b52144a2862444a (diff)
downloadmariadb-git-620d14f8c3521f9ec7283b8690e0e16434739d33.tar.gz
Automatic merge
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 62d2426d692..7a24b56dcb7 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -175,6 +175,7 @@ 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;