diff options
| author | unknown <hf@deer.(none)> | 2004-05-24 14:49:47 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-05-24 14:49:47 +0500 |
| commit | ff80392ea2e23f06f0f54ee99cbd126961b187c3 (patch) | |
| tree | a319b8fb51bf03515e7e11313fd3f201768132ba /sql | |
| parent | c574a347e261ef7cd5b9fbaca52e1c86f26ac07a (diff) | |
| parent | f94e0386b2ff813d97138c1fffe2d47220fd13cb (diff) | |
| download | mariadb-git-ff80392ea2e23f06f0f54ee99cbd126961b187c3.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3691
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_db.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 39c8c00898d..48c355b6cd9 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -18,6 +18,7 @@ /* create and drop of databases */ #include "mysql_priv.h" +#include <mysys_err.h> #include "sql_acl.h" #include <my_dir.h> #include <m_ctype.h> @@ -185,7 +186,7 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, strxmov(path, mysql_data_home, "/", db, NullS); unpack_dirname(path,path); // Convert if not unix - if (my_stat(path,&stat_info,MYF(MY_WME))) + if (my_stat(path,&stat_info,MYF(0))) { if (!(create_options & HA_LEX_CREATE_IF_NOT_EXISTS)) { @@ -197,6 +198,11 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, } else { + if (my_errno != ENOENT) + { + my_error(EE_STAT, MYF(0),path,my_errno); + goto exit; + } strend(path)[-1]=0; // Remove last '/' from path if (my_mkdir(path,0777,MYF(0)) < 0) { |