diff options
| author | unknown <monty@mysql.com> | 2004-07-11 12:16:25 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-07-11 12:16:25 +0300 |
| commit | 4ba63c4e8d1bfb82fb00be49989cbb238e41adad (patch) | |
| tree | 191ed74ed84bacdb891b5ddcbcdca8e7bdcdba5c /sql | |
| parent | f7fdf06271b0b9b80bd440a29ec58292763c757a (diff) | |
| parent | f4b2b7aa2d544d3aed4242f3f09a4526665b9da1 (diff) | |
| download | mariadb-git-4ba63c4e8d1bfb82fb00be49989cbb238e41adad.tar.gz | |
Merge
sql/sql_show.cc:
Auto merged
sql/mysql_priv.h:
SCCS merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 2 | ||||
| -rw-r--r-- | sql/sql_show.cc | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 34e1e7c9113..8707bc205df 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -635,6 +635,8 @@ int mysqld_show_variables(THD *thd,const char *wild); int mysqld_show(THD *thd, const char *wild, show_var_st *variables, enum enum_var_type value_type, pthread_mutex_t *mutex); +int mysql_find_files(THD *thd,List<char> *files, const char *db, + const char *path, const char *wild, bool dir); int mysqld_show_charsets(THD *thd,const char *wild); int mysqld_show_collations(THD *thd,const char *wild); int mysqld_show_storage_engines(THD *thd); diff --git a/sql/sql_show.cc b/sql/sql_show.cc index e217555e582..6d328243a59 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -37,9 +37,6 @@ static TYPELIB grant_types = { sizeof(grant_names)/sizeof(char **), grant_names}; #endif -static int mysql_find_files(THD *thd,List<char> *files, const char *db, - const char *path, const char *wild, bool dir); - static int store_create_info(THD *thd, TABLE *table, String *packet); @@ -361,7 +358,7 @@ int mysqld_show_column_types(THD *thd) } -static int +int mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, const char *wild, bool dir) { |