diff options
author | Georgi Kodinov <kgeorge@mysql.com> | 2008-12-01 17:22:16 +0200 |
---|---|---|
committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-12-01 17:22:16 +0200 |
commit | 6afd8123a3265feea6ca946556f7499eaefe2808 (patch) | |
tree | 780668255bbeeacd8effb883f816b3322b1b28a4 /sql/tztime.h | |
parent | 9a2d729bb370b0f5dead11e2f774eea66735580a (diff) | |
parent | c419185fed8a7e5feab99c29f01654028ac93866 (diff) | |
download | mariadb-git-6afd8123a3265feea6ca946556f7499eaefe2808.tar.gz |
merged bug 39920 and 5.1-main to 5.1-bugteam
Diffstat (limited to 'sql/tztime.h')
-rw-r--r-- | sql/tztime.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/tztime.h b/sql/tztime.h index 3d77a3eefa3..9bf103519c4 100644 --- a/sql/tztime.h +++ b/sql/tztime.h @@ -55,6 +55,9 @@ public: allocated on MEM_ROOT and should not require destruction. */ virtual ~Time_zone() {}; + +protected: + static inline void adjust_leap_second(MYSQL_TIME *t); }; extern Time_zone * my_tz_UTC; |