diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-13 13:54:19 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-13 13:54:19 +0100 |
| commit | d6907923a188417f3542e15994aba2d01bbab363 (patch) | |
| tree | 19b68f40cc4325c89128f1a9502d0338a9165bff /sql-common/my_time.c | |
| parent | d804b33acf550295c575aae6303227736ad8d909 (diff) | |
| parent | 3477b50a329fa5f60f93741884bd92a94158ce83 (diff) | |
| download | mariadb-git-d6907923a188417f3542e15994aba2d01bbab363.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
sql-common/my_time.c:
Auto merged
Diffstat (limited to 'sql-common/my_time.c')
| -rw-r--r-- | sql-common/my_time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index ab9a2c6d7c8..ebcf393c49a 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -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; |