diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-21 20:51:56 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-21 20:51:56 +0100 |
| commit | edab37cd680ebcca999d989c34251f6be1115c54 (patch) | |
| tree | 9a960e6324916997d8efa87ce8d48d099d78cab8 /sql/mysqld.h | |
| parent | 5bf311e1e853457c31dbadd3d130b2569a867d80 (diff) | |
| parent | 446554a15bd84f39ec4a8163e9f4456fa9be8fb2 (diff) | |
| download | mariadb-git-edab37cd680ebcca999d989c34251f6be1115c54.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 9246ea90fa1..296b747b1ce 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -501,6 +501,8 @@ get_thread_running() return num_thread_running; } +void set_server_version(void); + #if defined(MYSQL_DYNAMIC_PLUGIN) && defined(_WIN32) extern "C" THD *_current_thd_noinline(); #define _current_thd() _current_thd_noinline() @@ -534,6 +536,7 @@ extern scheduler_functions *thread_scheduler, *extra_thread_scheduler; extern char *opt_log_basename; extern my_bool opt_master_verify_checksum; extern my_bool opt_stack_trace; +extern my_bool opt_expect_abort; extern my_bool opt_slave_sql_verify_checksum; extern ulong binlog_checksum_options; extern bool max_user_connections_checking; |