diff options
| author | Tor Didriksen <tor.didriksen@sun.com> | 2010-05-19 11:18:59 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@sun.com> | 2010-05-19 11:18:59 +0200 |
| commit | 5539f5ccf6f71e102a44b484165655c3ceb8ea9d (patch) | |
| tree | 1ccb73398b1613c6e54918ef0e8268dad1c178bb /sql/event_data_objects.cc | |
| parent | 36be33b0ad829732b76d87f6d618546014fd96de (diff) | |
| download | mariadb-git-5539f5ccf6f71e102a44b484165655c3ceb8ea9d.tar.gz | |
Backport from next-mr-bugfixing of tor.didriksen@sun.com-20100106140051-3j2iuag63eltsr2e
Bug #50087 Interval arithmetic for Event_queue_element is not portable.
Subtraction of two unsigned months yielded a (very large) positive value.
Conversion of this to a signed value was not necessarily well defined.
Solution: do the subtraction on signed values.
mysql-test/r/events_scheduling.result:
Add test case.
mysql-test/t/events_scheduling.test:
Add test case.
sql/event_data_objects.cc:
Convert month to signed before doing the subtraction.
Diffstat (limited to 'sql/event_data_objects.cc')
| -rw-r--r-- | sql/event_data_objects.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index 92e237a17b7..0218092c4c7 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -834,8 +834,9 @@ bool get_next_time(const Time_zone *time_zone, my_time_t *next, } else { - long diff_months= (long) (local_now.year - local_start.year)*12 + - (local_now.month - local_start.month); + long diff_months= ((long) local_now.year - (long) local_start.year)*12 + + ((long) local_now.month - (long) local_start.month); + /* Unlike for seconds above, the formula below returns the interval that, when added to the local_start, will give the time in the |