summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSinisa@sinisa.nasamreza.org <>2004-02-11 19:17:27 +0200
committerSinisa@sinisa.nasamreza.org <>2004-02-11 19:17:27 +0200
commit7dc2a11f901597b2d2d9495a030f61aeba20c75c (patch)
treefd73a50e4b5df42e762fe56c20ee4fa6e5fafa4d
parentefb134f3a874befe4ab1779f597ada09f57ca191 (diff)
parentf54789bdfe74216eebf758e891c1bc699792cc47 (diff)
downloadmariadb-git-7dc2a11f901597b2d2d9495a030f61aeba20c75c.tar.gz
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
-rw-r--r--sql/sql_load.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 93dfcd84caf..3b8672188d4 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -93,6 +93,11 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
char *db = table_list->db; // This is never null
/* If no current database, use database where table is located */
char *tdb= thd->db ? thd->db : db;
+ /*
+ 'tdb' can be NULL only if both table_list->db and thd->db are NULL
+ 'db' itself can be NULL. but in that case it will generate
+ an error earlier open_ltable()).
+ */
bool transactional_table, log_delayed;
ulong skip_lines= ex->skip_lines;
DBUG_ENTER("mysql_load");