diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-03 21:39:04 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-03 21:39:04 +0000 |
| commit | ec81fca2d08a4cb9532aef7404c480f34fe145cb (patch) | |
| tree | aba1618cac773466e58a7ff45f66bb205fe52130 /sql/sql_show.cc | |
| parent | 52d5c01d8742960c23bc06be6b046da6e9951694 (diff) | |
| parent | 341d8aaee39951dfd771db2b0da9a689149facf1 (diff) | |
| download | mariadb-git-ec81fca2d08a4cb9532aef7404c480f34fe145cb.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/mysql-test-run.sh:
SCCS merged
sql/ha_ndbcluster.cc:
SCCS merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 714fb0a2efe..413de53f4bc 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -374,6 +374,7 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, if (wild && !wild[0]) wild=0; + bzero((char*) &table_list,sizeof(table_list)); if (!(dirp = my_dir(path,MYF(MY_WME | (dir ? MY_WANT_STAT : 0))))) @@ -445,6 +446,9 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, } DBUG_PRINT("info",("found: %d files", files->elements)); my_dirend(dirp); + + VOID(ha_find_files(thd,db,path,wild,dir,files)); + DBUG_RETURN(0); } |