diff options
| author | unknown <serg@serg.mylan> | 2005-04-05 13:23:11 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-04-05 13:23:11 +0200 |
| commit | 46aad9633e9ca7637c5e1733a8ed13b0e251d24a (patch) | |
| tree | 0a56278a2020f2d1a62f4609954f3e92e90ae0dc /sql/mysql_priv.h | |
| parent | b419262fe49bb3cc84f496e913edd3f1baf25283 (diff) | |
| parent | cd0a50bf34477bf547cc4a66f0d5d9651574a65b (diff) | |
| download | mariadb-git-46aad9633e9ca7637c5e1733a8ed13b0e251d24a.tar.gz | |
Merge
sql/field.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/handler.cc:
SCCS merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 7290cfd8e0d..1b1da6772af 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1114,10 +1114,6 @@ extern MY_BITMAP temp_pool; extern String my_empty_string; extern const String my_null_string; extern SHOW_VAR init_vars[],status_vars[], internal_vars[]; -extern SHOW_COMP_OPTION have_isam; -extern SHOW_COMP_OPTION have_innodb; -extern SHOW_COMP_OPTION have_berkeley_db; -extern SHOW_COMP_OPTION have_ndbcluster; extern struct system_variables global_system_variables; extern struct system_variables max_system_variables; extern struct system_status_var global_status_var; @@ -1138,12 +1134,13 @@ extern struct my_option my_long_options[]; extern SHOW_COMP_OPTION have_isam, have_innodb, have_berkeley_db; extern SHOW_COMP_OPTION have_example_db, have_archive_db, have_csv_db; extern SHOW_COMP_OPTION have_federated_db; +extern SHOW_COMP_OPTION have_blackhole_db; +extern SHOW_COMP_OPTION have_ndbcluster; extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink; -extern SHOW_COMP_OPTION have_query_cache, have_berkeley_db, have_innodb; +extern SHOW_COMP_OPTION have_query_cache; extern SHOW_COMP_OPTION have_geometry, have_rtree_keys; extern SHOW_COMP_OPTION have_crypt; extern SHOW_COMP_OPTION have_compress; -extern SHOW_COMP_OPTION have_blackhole_db; #ifndef __WIN__ extern pthread_t signal_thread; |