diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-25 12:55:12 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-25 14:31:15 +0100 |
| commit | ac2d4d49a041c4b0657d24a9b3b697cbcfe69790 (patch) | |
| tree | eafd3e47edbd85d76d3cbfefcf801f866e4f280d /sql/partition_info.cc | |
| parent | 30981dcf56a3e72550af06b59ba9d5d8b01b898c (diff) | |
| download | mariadb-git-ac2d4d49a041c4b0657d24a9b3b697cbcfe69790.tar.gz | |
fix THD::system_time to follow, well, system time
Because NOW() is set to system time, unless overriden.
And both should follow big manual system time changes,
while still coping with lowres system clocks.
Ignoring system time changes is both confusing and
breaks with restarts.
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 87d322cf7fa..ac33bbc6a7e 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -900,7 +900,7 @@ void partition_info::vers_set_hist_part(THD *thd) if (vers_info->interval.is_set()) { - if (vers_info->hist_part->range_value > thd->system_time) + if (vers_info->hist_part->range_value > thd->systime()) return; partition_element *next= NULL; @@ -911,7 +911,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->system_time) + if (next->range_value > thd->systime()) return; } goto warn; |