summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-02-14 21:23:20 -0700
committersasha@mysql.sashanet.com <>2001-02-14 21:23:20 -0700
commitafaf0cbd0f2e466d2d8eb496b0dc98b5ccd26b6e (patch)
tree8c9fde5b17283d8c928db454a2edb39c8a20c79e /sql
parentd2a023347f4b6ec71435652a81c02c36837d69d2 (diff)
downloadmariadb-git-afaf0cbd0f2e466d2d8eb496b0dc98b5ccd26b6e.tar.gz
fixed bug in timestamp replication
Diffstat (limited to 'sql')
-rw-r--r--sql/slave.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index c05b3478de0..8b765eca277 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -857,7 +857,8 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
thd->server_id = ev->server_id; // use the original server id for logging
thd->set_time(); // time the query
- ev->when = time(NULL);
+ if(!ev->when)
+ ev->when = time(NULL);
switch(type_code) {
case QUERY_EVENT: