diff options
| author | unknown <tomas@poseidon.(none)> | 2004-09-06 10:47:04 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-09-06 10:47:04 +0000 |
| commit | 862d056d4a238c580f01d662f9533bb86894fc63 (patch) | |
| tree | c0284b46721f242643e099825453df1d77d31438 /sql/sql_class.cc | |
| parent | c7e942a8ff90fe6100518361129209a7cd5ab48d (diff) | |
| parent | 3d390679e41f69a1b8d1c8b0599fac93ae16ac07 (diff) | |
| download | mariadb-git-862d056d4a238c580f01d662f9533bb86894fc63.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
sql/sql_class.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index bafd8323e17..9dcc3b24883 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -891,8 +891,10 @@ static File create_file(THD *thd, char *path, sql_exchange *exchange, #ifdef DONT_ALLOW_FULL_LOAD_DATA_PATHS option|= MY_REPLACE_DIR; // Force use of db directory #endif - (void) fn_format(path, exchange->file_name, thd->db ? thd->db : "", "", - option); + + strxnmov(path, FN_REFLEN, mysql_real_data_home, thd->db ? thd->db : "", + NullS); + (void) fn_format(path, exchange->file_name, path, "", option); if (!access(path, F_OK)) { my_error(ER_FILE_EXISTS_ERROR, MYF(0), exchange->file_name); |