diff options
author | unknown <magnus@neptunus.(none)> | 2004-09-21 12:13:58 +0200 |
---|---|---|
committer | unknown <magnus@neptunus.(none)> | 2004-09-21 12:13:58 +0200 |
commit | dd07a90d612278057217b50076e9100177570613 (patch) | |
tree | 800e2e50047d8deacfc968120c67c71a51cd8d95 /sql/handler.h | |
parent | 4d18add04cbd93f90e4d59feaa03e76b7e629549 (diff) | |
download | mariadb-git-dd07a90d612278057217b50076e9100177570613.tar.gz |
Changed WL#1424 to use the function ha_find_files. This is a simpler implementation and all handler specific code is hidden in the appropriate handler.
mysql-test/r/ndb_autodiscover.result:
Update test result, number of rows is 1
mysql-test/t/ndb_autodiscover.test:
Dont run the test where table is dropped in NDb with ndb_drop_table
sql/ha_ndbcluster.cc:
Implement function ndbcluster_find_files which will discover new tables and delete old tables
sql/ha_ndbcluster.h:
Implement function ndbcluster_find_files
Remove function ndbcluster_list_tables and ndbcluster_can_discover
sql/handler.cc:
Add ha_find_files called from mysql_find_files
Remove ha_can_discover and ha_list_tables
sql/handler.h:
Add ha_find_files called from mysql_find_files
Remove ha_can_discover and ha_list_tables
sql/sql_show.cc:
Revert to original version of sql_show.cc
Only changes to this version is that ha_find_files is called from mysql_find_files in order to give the handlers a possibility to find new files in engine
Diffstat (limited to 'sql/handler.h')
-rw-r--r-- | sql/handler.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index c01bfcd4f5f..fea03c5080e 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -565,7 +565,8 @@ int ha_change_key_cache(KEY_CACHE *old_key_cache, KEY_CACHE *new_key_cache); 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_find_files(THD *thd,const char *db,const char *path, + const char *wild, bool dir); int ha_table_exists(THD* thd, const char* db, const char* name); -int ha_can_discover(THD* thd, const char* name); + |