diff options
| author | monty@mashka.mysql.fi <> | 2004-02-20 17:43:02 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2004-02-20 17:43:02 +0200 |
| commit | 494e43c1f56d2a65fc804af865ae82661fbb046f (patch) | |
| tree | e13a23a1c9f28ed5eb2d903ba59a153cda3355ac /sql/sql_load.cc | |
| parent | f8b4732a5edccdf71eb65093c8bb6ec028176fec (diff) | |
| parent | e1fee022fa10fc0cceafbd774441d70311e10434 (diff) | |
| download | mariadb-git-494e43c1f56d2a65fc804af865ae82661fbb046f.tar.gz | |
merge with 4.0 to get security fixes and latest bug fixes
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 56a78bfd589..58a9b9c588d 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -93,7 +93,11 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, LOAD_FILE_INFO lf_info; #endif 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; |