summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-09-03 15:28:32 +0200
committerSergei Golubchik <serg@mariadb.org>2019-09-04 09:30:43 +0200
commit647d5b243020b799fd7112a801965f5780b86349 (patch)
tree4e2e51c35a17b8824271375cc243312568b9b5ee /sql/sql_class.h
parent08b01ace8a7284272662c793b3d93b3ddddc7123 (diff)
downloadmariadb-git-647d5b243020b799fd7112a801965f5780b86349.tar.gz
MDEV-20079 When setting back the system time while mysqld is running, NOW() and UNIX_TIMESTAMP() results get stuck
typo. system_time.start wasn't updated when system_time.sec and system_time.sec_part were.
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 3157f19351c..9bd486a540e 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -3443,6 +3443,7 @@ private:
{
system_time.sec= sec;
system_time.sec_part= sec_part;
+ system_time.start= hrtime;
}
else
{