summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-02-19 22:04:46 +0200
committerunknown <monty@mysql.com>2004-02-19 22:04:46 +0200
commit9bc5cdba41a0d2bc3c391469b14168f82e636a6b (patch)
tree08c075b3e2c0bbc36b991d19939b3e854361827d /sql/sql_load.cc
parent41a76c7c61b634ddb431dbb50e396d7dd5b5360c (diff)
parent68242939d818cf5d091d5dcf13e312994f423f9f (diff)
downloadmariadb-git-9bc5cdba41a0d2bc3c391469b14168f82e636a6b.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0 libmysql/libmysql.c: Auto merged
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 1603a7eb26a..a3ba14373b2 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -91,7 +91,11 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
bool is_fifo=0;
LOAD_FILE_INFO lf_info;
char *db = table_list->db; // This is never null
- /* If no current database, use database where table is located */
+ /*
+ If path for file is not defined, we will use the current database.
+ If this is not set, we will use the directory where the table to be
+ loaded is located
+ */
char *tdb= thd->db ? thd->db : db; // Result is never null
bool transactional_table, log_delayed;
ulong skip_lines= ex->skip_lines;