mirror of
https://github.com/MariaDB/server.git
synced 2026-05-02 21:25:36 +02:00
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/mysql-5.1-build sql-common/my_time.c: Auto merged
This commit is contained in:
commit
e93a20a5fc
31 changed files with 268 additions and 72 deletions
|
|
@ -780,7 +780,7 @@ long calc_daynr(uint year,uint month,uint day)
|
|||
*/
|
||||
my_time_t
|
||||
my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone,
|
||||
bool *in_dst_time_gap)
|
||||
my_bool *in_dst_time_gap)
|
||||
{
|
||||
uint loop;
|
||||
time_t tmp= 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue