Commit 5a1b15b3 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

more cleanup of slave load data infile - trying to track down bug,

parent 3e4697c8

.bzrignore

+4 −0
Original line number Diff line number Diff line
@@ -425,3 +425,7 @@ mysql-test/var/slave-data/mysql-bin.012 
mysql-test/var/slave-data/mysql-bin.013

mysql-test/var/slave-data/mysql-bin.014

mysql-test/var/slave-data/mysql-bin.index

BitKeeper/tmp/applied.list

BitKeeper/tmp/backup.list

BitKeeper/tmp/backup.sfio

BitKeeper/tmp/sfile.list

sql/slave.cc

+3 −0
Original line number Diff line number Diff line
@@ -874,6 +874,9 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
	if(mysql_load(thd, &ex, &tables, fields, handle_dup, 1,

		      TL_WRITE))

	  thd->query_error = 1;

	if(thd->cuted_fields)

	  sql_print_error("Slave: load data infile at position %d in log \

'%s' produced %d warning(s)", glob_mi.pos, RPL_LOG_NAME, thd->cuted_fields );

	net->pkt_nr = thd->net.pkt_nr;

      }

      else // we will just ask the master to send us /dev/null if we do not want to

sql/sql_load.cc

+3 −1
Original line number Diff line number Diff line
@@ -241,6 +241,8 @@ 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);

  // 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())