diff options
| author | unknown <magnus@neptunus.(none)> | 2004-09-14 10:03:56 +0200 |
|---|---|---|
| committer | unknown <magnus@neptunus.(none)> | 2004-09-14 10:03:56 +0200 |
| commit | de3db35c4576f711fa69de7bb90ebeb54ef31cc9 (patch) | |
| tree | b9a32ef993628ed3929a21dc4f4fa848ca620465 /sql/handler.h | |
| parent | 042b3cd71693dec7031cef138e80fdf2e55eb02e (diff) | |
| parent | cda3770345d8d57b0a4c31e68d9551c69a7c6108 (diff) | |
| download | mariadb-git-de3db35c4576f711fa69de7bb90ebeb54ef31cc9.tar.gz | |
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 0b7e9c04381..c01bfcd4f5f 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -540,6 +540,8 @@ void ha_close_connection(THD* thd); enum db_type ha_checktype(enum db_type database_type); int ha_create_table(const char *name, HA_CREATE_INFO *create_info, bool update_create_info); +int ha_create_table_from_engine(THD* thd, const char *db, const char *name, + bool create_if_found); int ha_delete_table(enum db_type db_type, const char *path); void ha_drop_database(char* path); int ha_init_key_cache(const char *name, KEY_CACHE *key_cache); @@ -561,5 +563,9 @@ bool ha_flush_logs(void); int ha_enable_transaction(THD *thd, bool on); int ha_change_key_cache(KEY_CACHE *old_key_cache, KEY_CACHE *new_key_cache); -int ha_discover(const char* dbname, const char* name, +int ha_discover(THD* thd, const char* dbname, const char* name, const void** frmblob, uint* frmlen); +int ha_list_tables(THD* thd, HASH *tables, const char* db); +int ha_table_exists(THD* thd, const char* db, const char* name); +int ha_can_discover(THD* thd, const char* name); + |