diff options
| author | unknown <reggie@mdk10.(none)> | 2005-05-20 16:34:59 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-05-20 16:34:59 -0500 |
| commit | 606d8a5ab0000ccf1120201db21f92ef69b52a5c (patch) | |
| tree | 1467155c10e8996d9cce3ec39db813852687c942 /sql/sql_db.cc | |
| parent | 03e26e50b9829124246ffb6b755e3809c126cb95 (diff) | |
| parent | c1ae672adda45a1b8c5637b8f4d6a3f91378ea20 (diff) | |
| download | mariadb-git-606d8a5ab0000ccf1120201db21f92ef69b52a5c.tar.gz | |
fixed conflicts
VC++Files/mysys/mysys.dsp:
Auto merged
include/my_sys.h:
Auto merged
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 3bdd800cd2f..d110ff6f778 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -1076,7 +1076,7 @@ bool mysql_change_db(THD *thd, const char *name) length=unpack_dirname(path,path); // Convert if not unix if (length && path[length-1] == FN_LIBCHAR) path[length-1]=0; // remove ending '\' - if (access(path,F_OK)) + if (my_access(path,F_OK)) { my_error(ER_BAD_DB_ERROR, MYF(0), dbname); my_free(dbname,MYF(0)); |