diff options
| author | patg@krsna.patg.net <> | 2005-03-01 23:23:11 -0800 |
|---|---|---|
| committer | patg@krsna.patg.net <> | 2005-03-01 23:23:11 -0800 |
| commit | 9e3c670b0202acc18b2aa43c386cd8443930312c (patch) | |
| tree | d72b4d3f3dc3cd9ce2079d8dc783ccda587dc6a8 /sql/handler.cc | |
| parent | b9ae89a1e632c0fbc1d62a3512581b50e0d6c7a6 (diff) | |
| parent | 0909b09b43aa1b295bf0f9956069a04a8dadaacd (diff) | |
| download | mariadb-git-9e3c670b0202acc18b2aa43c386cd8443930312c.tar.gz | |
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.patg.net:/home/patg/mysql-5.0
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index cd3656c6f0d..e11926d16e0 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -395,6 +395,16 @@ int ha_init() ha_was_inited_ok(ht++); } #endif +#ifdef HAVE_FEDERATED_DB + if (have_federated_db == SHOW_OPTION_YES) + { + if (federated_db_init()) + { + have_federated_db= SHOW_OPTION_DISABLED; + error= 1; + } + } +#endif #ifdef HAVE_ARCHIVE_DB if (have_archive_db == SHOW_OPTION_YES) { @@ -441,6 +451,10 @@ int ha_panic(enum ha_panic_function flag) if (have_ndbcluster == SHOW_OPTION_YES) error|=ndbcluster_end(); #endif +#ifdef HAVE_FEDERATED_DB + if (have_federated_db == SHOW_OPTION_YES) + error|= federated_db_end(); +#endif #ifdef HAVE_ARCHIVE_DB if (have_archive_db == SHOW_OPTION_YES) error|= archive_db_end(); |