diff options
| author | unknown <guilhem@mysql.com> | 2004-05-14 23:19:42 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-05-14 23:19:42 +0200 |
| commit | 8d18ae3986f15c0fd4bb4da2f06487e14420106b (patch) | |
| tree | b31c218c4628b9f80bf9e9d096908ada5dbe2d1f /sql | |
| parent | 177922377e4ebd91f870acd4643d2c271e4eee19 (diff) | |
| download | mariadb-git-8d18ae3986f15c0fd4bb4da2f06487e14420106b.tar.gz | |
a code fix (don't specify default value of argument twice), updating a line of SHOW SLAVE STATUS
in tests after the last 4.1->5.0 merge, and:
*** The same as ChangeSet@1.1822.1.1, 2004-05-14 23:08:03+02:00, guilhem@mysql.com of MySQL 4.0 ***
Replication testsuite: making the master-slave synchronization less likely to fail,
by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
in sync_with_master and sync_slave_with_master.
The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
but may affect 4.x as well, so I fixed 4.x too. Note that I am also fixing
5.0, with the same exact patch, because I don't want to leave 5.0 broken
until the next 4.0->4.1->5.0 merge.
client/mysqltest.c:
in sync_with_master (and sync_slave_with_master), if MASTER_POS_WAIT() returns NULL,
it may be that the slave SQL thread did not have time to start yes, so we sleep
1 sec and retry, 4 times at most.
mysql-test/r/rpl_server_id2.result:
result update
mysql-test/t/rpl_server_id2.test:
master_slave.inc already drops the table
sql/slave.cc:
gcc compiler complained that the default value of skip_lock was specified in slave.h AND slave.cc
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 1fe4aa40f8e..f588e034a10 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -465,7 +465,7 @@ void init_slave_skip_errors(const char* arg) void st_relay_log_info::inc_group_relay_log_pos(ulonglong log_pos, - bool skip_lock=0) + bool skip_lock) { if (!skip_lock) pthread_mutex_lock(&data_lock); @@ -3046,7 +3046,7 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli) if ((ev->server_id == (uint32) ::server_id && !replicate_same_server_id && - type_code!= FORMAT_DESCRIPTION_EVENT) || + type_code != FORMAT_DESCRIPTION_EVENT) || (rli->slave_skip_counter && type_code != ROTATE_EVENT && type_code != STOP_EVENT && type_code != START_EVENT_V3 && type_code!= FORMAT_DESCRIPTION_EVENT)) |