diff options
| author | unknown <andrey@lmy004.> | 2005-08-18 23:40:04 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2005-08-18 23:40:04 +0200 |
| commit | 4cd0ef49788af2d595905017603825342c0cdabf (patch) | |
| tree | 8e1ebe9ea782d6a063976314309e520f7dcf1390 /sql/sql_show.cc | |
| parent | 88a7d01eba6960ebd73307b37527946a22142d34 (diff) | |
| parent | 7370b241a1bcd81fa24e793c30df5e09923e071a (diff) | |
| download | mariadb-git-4cd0ef49788af2d595905017603825342c0cdabf.tar.gz | |
Merge lmy004.:/work/mysql-5.0-clean
into lmy004.:/work/mysql-5.0-bug12591
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index b06f1d683dd..3bb349d7c29 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -264,8 +264,14 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, bzero((char*) &table_list,sizeof(table_list)); - if (!(dirp = my_dir(path,MYF(MY_WME | (dir ? MY_WANT_STAT : 0))))) + if (!(dirp = my_dir(path,MYF(dir ? MY_WANT_STAT : 0)))) + { + if (my_errno == ENOENT) + my_error(ER_BAD_DB_ERROR, MYF(ME_BELL+ME_WAITTANG), db); + else + my_error(ER_CANT_READ_DIR, MYF(ME_BELL+ME_WAITTANG), path, my_errno); DBUG_RETURN(-1); + } for (i=0 ; i < (uint) dirp->number_off_files ; i++) { |