diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-17 23:35:40 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-17 23:35:40 -0700 |
| commit | 53ada89055707cc2c70001e139e5c85599875c9a (patch) | |
| tree | ccc45fd7f4b333edac1dbea98d87b49f1a6635a5 /sql/slave.cc | |
| parent | 5abcec92c0abcc76658908791cf7f9d2fcc8004a (diff) | |
| download | mariadb-git-53ada89055707cc2c70001e139e5c85599875c9a.tar.gz | |
fixed bugs in delayed insert replication and when slave loses connection after Int_var but before Query
public test suite now tests replication code as well
mysql-test/mybin/mysql-test_install_db:
fixes to test replication with two daemons on one machine
mysql-test/mysql-test-run:
fixes for replication tests -- still need to test gcov, the rest works
mysql-test/t/include/master-slave.inc:
include file for replication tests
sql/slave.cc:
fixed bug for the case when the slave loses connection after it has read Int_var event but before Query
sql/sql_insert.cc:
reset error in delayed thread
slave converts delayed insert to regular
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index aae2e6e40cb..bc08fee7c03 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1053,6 +1053,8 @@ static void safe_connect(THD* thd, MYSQL* mysql, MASTER_INFO* mi) static void safe_reconnect(THD* thd, MYSQL* mysql, MASTER_INFO* mi) { + mi->pending = 0; // if we lost connection after reading a state set event + // we will be re-reading it, so pending needs to be cleared while(!slave_killed(thd) && mc_mysql_reconnect(mysql)) { sql_print_error( |