summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2000-12-07 11:40:22 -0700
committerunknown <sasha@mysql.sashanet.com>2000-12-07 11:40:22 -0700
commitbbc25ae6948cac32cc8322eb15e508d1dde1c49c (patch)
tree33ccbfceb83e94bc07d50f125b617e08cb8c8cbe /sql
parent8a61d511050b88c28a87c4a650cb890aa8938c40 (diff)
downloadmariadb-git-bbc25ae6948cac32cc8322eb15e508d1dde1c49c.tar.gz
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
Diffstat (limited to 'sql')
-rw-r--r--sql/slave.cc9
1 files changed, 1 insertions, 8 deletions
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);