database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  zim.(none):/home/brian/mysql/merge-5.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
This commit is contained in:
unknown
2006-09-15 10:48:30 -07:00
parent 7d131bcde2 d79485a9be
commit eceb03503d
32 changed files with 408 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
sql/mysql_priv.h
View File

@ -1625,61 +1625,63 @@ extern TYPELIB log_output_typelib;
/* optional things, have_* variables */
#ifdef WITH_INNOBASE_STORAGE_ENGINE
extern handlerton innobase_hton;
#define have_innodb innobase_hton.state
extern handlerton *innobase_hton;
extern SHOW_COMP_OPTION have_innodb;
#else
extern SHOW_COMP_OPTION have_innodb;
#endif
#ifdef WITH_EXAMPLE_STORAGE_ENGINE
extern handlerton example_hton;
#define have_example_db example_hton.state
extern handlerton *example_hton;
extern SHOW_COMP_OPTION have_example_db;
#else
extern SHOW_COMP_OPTION have_example_db;
#endif
#ifdef WITH_ARCHIVE_STORAGE_ENGINE
extern handlerton archive_hton;
#define have_archive_db archive_hton.state
extern handlerton *archive_hton;
extern SHOW_COMP_OPTION have_archive_db;
#else
extern SHOW_COMP_OPTION have_archive_db;
#endif
#ifdef WITH_CSV_STORAGE_ENGINE
extern handlerton tina_hton;
#define have_csv_db tina_hton.state
extern handlerton *tina_hton;
extern SHOW_COMP_OPTION have_csv_db;
#else
extern SHOW_COMP_OPTION have_csv_db;
#endif
#ifdef WITH_FEDERATED_STORAGE_ENGINE
extern handlerton federated_hton;
#define have_federated_db federated_hton.state
extern handlerton *federated_hton;
extern SHOW_COMP_OPTION have_federated_db;
#else
extern SHOW_COMP_OPTION have_federated_db;
#endif
#ifdef WITH_BLACKHOLE_STORAGE_ENGINE
extern handlerton blackhole_hton;
#define have_blackhole_db blackhole_hton.state
extern handlerton *blackhole_hton;
extern SHOW_COMP_OPTION have_blackhole_db;
#else
extern SHOW_COMP_OPTION have_blackhole_db;
#endif
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
extern handlerton ndbcluster_hton;
#define have_ndbcluster ndbcluster_hton.state
extern handlerton *ndbcluster_hton;
extern SHOW_COMP_OPTION have_ndbcluster;
#else
extern SHOW_COMP_OPTION have_ndbcluster;
#endif
#ifdef WITH_PARTITION_STORAGE_ENGINE
extern handlerton partition_hton;
#define have_partition_db partition_hton.state
extern handlerton *partition_hton;
extern SHOW_COMP_OPTION have_partition_db;
#else
extern SHOW_COMP_OPTION have_partition_db;
#endif
extern handlerton myisammrg_hton;
/* MRG_MYISAM handler is always built, but may be skipped */
#define have_merge_db myisammrg_hton.state
#ifdef WITH_MYISAMMRG_STORAGE_ENGINE
extern handlerton *myisammrg_hton;
extern SHOW_COMP_OPTION have_merge_db;
#else
extern SHOW_COMP_OPTION have_merge_db;
#endif
extern handlerton myisam_hton;
extern handlerton myisammrg_hton;
extern handlerton heap_hton;
extern handlerton *myisam_hton;
extern handlerton *heap_hton;
extern SHOW_COMP_OPTION have_row_based_replication;
extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_dlopen;