diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-11-02 16:02:16 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-11-02 16:02:16 +0200 |
| commit | 9678beb630abaea8b935bf331fefd3594eb6a66c (patch) | |
| tree | fcc8254adc2d4368395bce0852d05ed9521ad094 | |
| parent | c10eb6ec6170734d87ab7f60a1c506c544de88e7 (diff) | |
| parent | 1a5a109524cbd3445544888170686b023c6331b8 (diff) | |
| download | mariadb-git-9678beb630abaea8b935bf331fefd3594eb6a66c.tar.gz | |
merge
| -rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index be3dd8a0ca2..19a73c85a9b 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -480,12 +480,6 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db, else if (wild_compare(uname, wild, 0)) continue; } - if (!(file_name= - thd->make_lex_string(file_name, uname, file_name_len, TRUE))) - { - my_dirend(dirp); - DBUG_RETURN(FIND_FILES_OOM); - } } else { |