summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-02-16 10:15:52 +0200
committermonty@mysql.com <>2004-02-16 10:15:52 +0200
commitd1d48a9dd5e3a6ff3d5aadf9234d66777216b682 (patch)
treef9bef14abcf4ef1e6145cb3c16e63c9a56e221e9 /sql/sql_load.cc
parentf43093ec0e1ca391f0cdde589418d19c4b82241a (diff)
parent4aafb1ef3d9387c1ec10efdf69e47bdceb6f083c (diff)
downloadmariadb-git-d1d48a9dd5e3a6ff3d5aadf9234d66777216b682.tar.gz
Merge with 4.0 to get fix for mysqlbinlog
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 45b76e44f28..f910e947720 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -94,7 +94,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
#endif
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;
+ char *tdb= thd->db ? thd->db : db; // Result is never null
bool transactional_table, log_delayed;
ulong skip_lines= ex->skip_lines;
DBUG_ENTER("mysql_load");