diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-12-07 21:51:29 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-12-07 21:51:29 -0700 |
| commit | 4d3f79265b2dc26f085161ac70cf17a7ae2d56e8 (patch) | |
| tree | d36fb68b4d57471e35016a912f98507a73a2daa8 /sql/sql_load.cc | |
| parent | bbc25ae6948cac32cc8322eb15e508d1dde1c49c (diff) | |
| download | mariadb-git-4d3f79265b2dc26f085161ac70cf17a7ae2d56e8.tar.gz | |
more cleanup of slave load data infile - trying to track down bug,
BitKeeper/etc/ignore:
Added BitKeeper/tmp/applied.list BitKeeper/tmp/backup.list BitKeeper/tmp/backup.sfio BitKeeper/tmp/sfile.list to the ignore list
sql/slave.cc:
log warnings from replicated load data infile
sql/sql_load.cc:
do not log load data infile from the master to update log on the slave
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 4 |
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; |