summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-02-14 21:23:20 -0700
committerunknown <sasha@mysql.sashanet.com>2001-02-14 21:23:20 -0700
commit9a17a41ed8b2778db19878e58bdbe3dc36534d9a (patch)
tree8c9fde5b17283d8c928db454a2edb39c8a20c79e /sql
parent0a4ce964b49214ce0acf9353bf58d9c7380eb83d (diff)
downloadmariadb-git-9a17a41ed8b2778db19878e58bdbe3dc36534d9a.tar.gz
fixed bug in timestamp replication
mysql-test/r/rpl000002.result: test timestamp replication mysql-test/t/rpl000002.test: test 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: