diff options
| author | unknown <magnus@shellback.(none)> | 2004-09-26 16:11:24 +0200 |
|---|---|---|
| committer | unknown <magnus@shellback.(none)> | 2004-09-26 16:11:24 +0200 |
| commit | 5077ba47ad95f166b107dd4da29ae595516e85ab (patch) | |
| tree | 1d3702820ede0b06dd2271c41fe8c3d78c8afe5c /sql/handler.cc | |
| parent | 0609dba34abe2513afeca29462b48ad930bdbdb8 (diff) | |
| download | mariadb-git-5077ba47ad95f166b107dd4da29ae595516e85ab.tar.gz | |
WL#1424 Updated after review
* Changed the implementation of ndbcluster_find_files to be more efficient, using only one mutex lock
* Moved ha_find_files to end of mysql_find_files so that it can be passed the list that we are interested to find.
mysql-test/t/ndb_autodiscover.test:
Added a new test case, disabled for now, waiting for mysql-test-run to set a NDB_CONNECTSTRING
sql/ha_ndbcluster.cc:
Rewrite of ndbcluster_find_files to remove and delete files using only one mutex lock.
This version only discover files that fulfill wildcard.
sql/ha_ndbcluster.h:
Add list of files as parameter
sql/handler.cc:
Add list of files as parameter
sql/handler.h:
Add list of files as parameter
sql/sql_show.cc:
Moving the ha_find_files to end of function, so that the file lista can be passsed to it.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index dc2f213640a..c7e7b08ba6e 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1471,7 +1471,7 @@ int ha_discover(THD* thd, const char* db, const char* name, int ha_find_files(THD *thd,const char *db,const char *path, - const char *wild, bool dir) + const char *wild, bool dir, List<char> *files) { int error= 0; DBUG_ENTER("ha_find_files"); @@ -1479,7 +1479,7 @@ ha_find_files(THD *thd,const char *db,const char *path, db, path, wild, dir)); #ifdef HAVE_NDBCLUSTER_DB if (have_ndbcluster == SHOW_OPTION_YES) - error= ndbcluster_find_files(thd, db, path, wild, dir); + error= ndbcluster_find_files(thd, db, path, wild, dir, files); #endif DBUG_RETURN(error); |