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 | c7b3b3f02b7fb0c254f333aafbf5a5fdab08a0a0 (patch) | |
| tree | 1467155c10e8996d9cce3ec39db813852687c942 /sql/sql_db.cc | |
| parent | 348ae81b069204330d47f9aab46d60e07360e08c (diff) | |
| parent | d7a4a8b63468637d1907bb5ec1fdb558c5b6d913 (diff) | |
| download | mariadb-git-c7b3b3f02b7fb0c254f333aafbf5a5fdab08a0a0.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)); |