Commit 3e4697c8 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

rpl000001 sporadic failure mystery solved - the table was being opened twice :-)

parent b169cd69

.bzrignore

+15 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/mysql-test-run

+1 −1
Original line number Diff line number Diff line
@@ -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 \

sql/slave.cc

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