summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2000-12-07 21:51:29 -0700
committersasha@mysql.sashanet.com <>2000-12-07 21:51:29 -0700
commit5a1b15b3be3652c7e9da10b5f6910e18315cfc21 (patch)
treed36fb68b4d57471e35016a912f98507a73a2daa8 /sql/sql_load.cc
parent3e4697c8b24a5f0dbc4a96280c2ee79f9fb467d2 (diff)
downloadmariadb-git-5a1b15b3be3652c7e9da10b5f6910e18315cfc21.tar.gz
more cleanup of slave load data infile - trying to track down bug,
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 7c2d77ce3fc..b73f6893225 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -241,7 +241,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
sprintf(name,ER(ER_LOAD_INFO),info.records,info.deleted,
info.records-info.copied,thd->cuted_fields);
send_ok(&thd->net,info.copied+info.deleted,0L,name);
- mysql_update_log.write(thd,thd->query,thd->query_length);
+ // on the slave thd->query is never initialized
+ if(!thd->slave_thread)
+ mysql_update_log.write(thd,thd->query,thd->query_length);
if (!table->file->has_transactions())
thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;