mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
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
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user