From bbc25ae6948cac32cc8322eb15e508d1dde1c49c Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Thu, 7 Dec 2000 11:40:22 -0700
Subject: [PATCH] rpl000001 sporadic failure mystery solved - the table was
 being opened twice :-)

BitKeeper/etc/ignore:
  Added mysql-test/var/slave-data/mysql-bin.001 mysql-test/var/slave-data/mysql-bin.002 mysql-test/var/slave-data/mysql-bin.003 mysql-test/var/slave-data/mysql-bin.004 mysql-test/var/slave-data/mysql-bin.005 mysql-test/var/slave-data/mysql-bin.006 mysql-test/var/slave-data/mysql-bin.007 mysql-test/var/slave-data/mysql-bin.008 mysql-test/var/slave-data/mysql-bin.009 mysql-test/var/slave-data/mysql-bin.010 mysql-test/var/slave-data/mysql-bin.011 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 to the ignore list
mysql-test/mysql-test-run:
  re-added --log-bin --log-slave updates to slave startup options
sql/slave.cc:
  fixed bug in LOAD DATA INFILE replication
---
 .bzrignore                | 15 +++++++++++++++
 mysql-test/mysql-test-run |  2 +-
 sql/slave.cc              |  9 +--------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index 9b4c9558025..eff6aeb4967 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -410,3 +410,18 @@ BitKeeper/tmp/patch
 BitKeeper/tmp/pid
 mysql-test/var/lib/test/test3.frm
 mysql-test/var/lib/test/test3.MRG
+mysql-test/var/slave-data/mysql-bin.001
+mysql-test/var/slave-data/mysql-bin.002
+mysql-test/var/slave-data/mysql-bin.003
+mysql-test/var/slave-data/mysql-bin.004
+mysql-test/var/slave-data/mysql-bin.005
+mysql-test/var/slave-data/mysql-bin.006
+mysql-test/var/slave-data/mysql-bin.007
+mysql-test/var/slave-data/mysql-bin.008
+mysql-test/var/slave-data/mysql-bin.009
+mysql-test/var/slave-data/mysql-bin.010
+mysql-test/var/slave-data/mysql-bin.011
+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
diff --git a/mysql-test/mysql-test-run b/mysql-test/mysql-test-run
index 4af675e4be6..865839aecda 100755
--- a/mysql-test/mysql-test-run
+++ b/mysql-test/mysql-test-run
@@ -347,7 +347,7 @@ start_slave()
 	    --master-connect-retry=1 \
 	    --master-host=127.0.0.1 \
 	    --master-port=$MASTER_MYPORT \
-	    --core-file \
+	    --core-file --log-bin --log-slave-updates \
             --basedir=$MY_BASEDIR \
             --datadir=$SLAVE_MYDDIR \
 	    --pid-file=$SLAVE_MYPID \
diff --git a/sql/slave.cc b/sql/slave.cc
index bea48af02af..ece6341ca16 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -861,14 +861,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
 	tables.db = thd->db;
 	tables.name = tables.real_name = (char*)lev->table_name;
 	tables.lock_type = TL_WRITE;
-	    
-	if (open_tables(thd, &tables))
-	{
-	  sql_print_error("Slave:  error opening table %s ",
-			  tables.name);
-	  delete ev;
-	  return 1;
-	}
+	// the table will be opened in mysql_load    
 
 	List<Item> fields;
 	lev->set_fields(fields);