summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-09-03 02:25:27 +0300
committerunknown <monty@mysql.com>2004-09-03 02:25:27 +0300
commit1b51f98e477c6f85ae3f4b82e41c5bc337de127c (patch)
tree2c3de27c55c2158bb0643aad40b6246069fb7920 /sql/sql_class.cc
parenta88ab457e32027cae8c7cf07e4b1be796468f9b0 (diff)
downloadmariadb-git-1b51f98e477c6f85ae3f4b82e41c5bc337de127c.tar.gz
Remove extra '/' after mysql_real_data_home
Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump mysql-test/mysql-test-run.sh: Ensure that clients used the supplied --socket argument mysql-test/r/lowercase_table.result: Remove tables used in other tests that may affect this one mysql-test/r/rename.result: Remove tables used in other tests that may affect this one mysql-test/t/lowercase_table.test: Remove tables used in other tests that may affect this one mysql-test/t/rename.test: Remove tables used in other tests that may affect this one sql/item_cmpfunc.cc: Remove not relevant comment sql/sql_class.cc: Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump sql/sql_load.cc: Remove extra '/' after mysql_real_data_home sql/sql_table.cc: Remove extra '/' after mysql_real_data_home
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc3
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))
{