diff options
| author | unknown <monty@mysql.com> | 2004-09-03 02:26:00 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-09-03 02:26:00 +0300 |
| commit | c91fb136413030353b93ac41a7ef8430a6393509 (patch) | |
| tree | e958f1bab0d9af79473522448e052009f5315c5c /sql/sql_class.cc | |
| parent | 9b5a35847bde458a208eec532ee2b579251d9a68 (diff) | |
| parent | 1b51f98e477c6f85ae3f4b82e41c5bc337de127c (diff) | |
| download | mariadb-git-c91fb136413030353b93ac41a7ef8430a6393509.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/sql_prepare.cc:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 36b1b89f6bf..b103ee29095 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -891,7 +891,8 @@ static File create_file(THD *thd, char *path, sql_exchange *exchange, option|= MY_REPLACE_DIR; // Force use of db directory #endif - strxnmov(path, FN_REFLEN, mysql_real_data_home, thd->db ? thd->db : ""); + 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)) { |