summaryrefslogtreecommitdiff
path: root/sql/partition_info.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-05-02 21:53:12 +0200
committerSergei Golubchik <serg@mariadb.org>2018-05-12 10:16:46 +0200
commita4272bf154acf0e35b4b678812024b43a0c57829 (patch)
treeb586567adc4344660452561cf578260ae4a3c8f5 /sql/partition_info.cc
parent4203f572aeebb55ad97c9576d58c0a14ed73862a (diff)
downloadmariadb-git-a4272bf154acf0e35b4b678812024b43a0c57829.tar.gz
versioning: use @@timestamp
Don't use hidden system time in versioning, but keep the system time logic in THD to workaround low-res system clock and replication not versioned to versioned. This reverts MDEV-14788 (System versioning cannot be based on local timestamps, as it is now). Versioning is based on local timestamps again, but timestamps are protected by MDEV-15923 (option to control who can set session @@timestamp).
Diffstat (limited to 'sql/partition_info.cc')
-rw-r--r--sql/partition_info.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index 746d00ef8d1..5c1cb106b28 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -859,7 +859,7 @@ void partition_info::vers_set_hist_part(THD *thd)
if (vers_info->interval.is_set())
{
- if (vers_info->hist_part->range_value > thd->systime())
+ if (vers_info->hist_part->range_value > thd->query_start())
return;
partition_element *next= NULL;
@@ -870,7 +870,7 @@ void partition_info::vers_set_hist_part(THD *thd)
while ((next= it++) != vers_info->now_part)
{
vers_info->hist_part= next;
- if (next->range_value > thd->systime())
+ if (next->range_value > thd->query_start())
return;
}
goto warn;