diff options
| author | guilhem@mysql.com <> | 2003-10-29 14:23:35 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2003-10-29 14:23:35 +0100 |
| commit | 59d0872aa05e8b02e78db16b1afbe2837af333cf (patch) | |
| tree | fce8da3a99c175419b43436ce7e5ca6b3d7c8618 /sql/slave.cc | |
| parent | c238a9256ab484a4fdbe14a461c3ca96cfcebca8 (diff) | |
| download | mariadb-git-59d0872aa05e8b02e78db16b1afbe2837af333cf.tar.gz | |
Fix for BUG#1686
"If 2 master threads with same-name temp table, slave makes bad binlog"
and (two birds with one stone) for
BUG#1240 "slave of slave breaks when STOP SLAVE was issud on parent slave
and temp tables".
Here is the design change:
in a slave running with --log-slave-updates, events are now logged with the
thread id they had on the master. So no more id conflicts between master threads,
but introduces id conflicts between one master thread and one normal
client thread connected to the slave. This is solved by storing the server id
in the temp table's name.
New test which requires mysql-test-run to be run with --manager,
otherwise it will be skipped.
Undoing a Monty's change (hum, a chill runs down my spine ;) which was
"Cleanup temporary tables when slave ends" in ChangeSet 1.1572.1.1.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index b679ac2f6b8..90b0cc74fd8 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2719,8 +2719,6 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \ RPL_LOG_NAME, llstr(rli->master_log_pos,llbuff)); err: - /* Free temporary tables etc */ - thd->cleanup(); VOID(pthread_mutex_lock(&LOCK_thread_count)); thd->query = thd->db = 0; // extra safety VOID(pthread_mutex_unlock(&LOCK_thread_count)); |