Merge work.mysql.com:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto converge

.bzrignore

@@ -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

BitKeeper/etc/logging_ok

 jani@prima.mysql.com
+jani@prima.mysql.fi
 sasha@mysql.sashanet.com
 sasha@work.mysql.com
 serg@serg.mysql.com
-jani@prima.mysql.fi

sql/slave.cc

@@ -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

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