diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-12 15:44:34 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-12 15:44:34 +0200 |
| commit | eceba8912c9af415f9704bb671ddb4022eb8d9fc (patch) | |
| tree | 5fdae14ec96fd61b574fe1c8b2d62d304114c53c /sql/mysql_priv.h | |
| parent | e44bda225abd5a736999b9c73ac88e059d823c2d (diff) | |
| parent | 6e7de781d73b8967f1ab9e6c076795dd83429a80 (diff) | |
| download | mariadb-git-eceba8912c9af415f9704bb671ddb4022eb8d9fc.tar.gz | |
merge of 5.1-main into mysql-trunk.
Changes to ha_innodb.cc are not propagated to plugin, they will come back
via Oracle/Innobase if needed.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 8a7501ba108..cd1a31f0fab 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1993,6 +1993,7 @@ extern bool opt_disable_networking, opt_skip_show_db; extern bool opt_ignore_builtin_innodb; extern my_bool opt_character_set_client_handshake; extern bool volatile abort_loop, shutdown_in_progress; +extern bool in_bootstrap; extern uint volatile thread_count, thread_running, global_read_lock; extern uint connection_count; extern my_bool opt_sql_bin_update, opt_safe_user_create, opt_no_mix_types; |