diff options
| author | msvensson@neptunus.(none) <> | 2006-11-13 13:54:19 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-11-13 13:54:19 +0100 |
| commit | 683d1898974a8533d352c012d5384104d7d214fe (patch) | |
| tree | 19b68f40cc4325c89128f1a9502d0338a9165bff /sql-common | |
| parent | 00a34629efa5b40eb57425bbdd70869943cd2fda (diff) | |
| parent | 68a7d45a0a32047aca52ca96765172c03a6f5db1 (diff) | |
| download | mariadb-git-683d1898974a8533d352c012d5384104d7d214fe.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'sql-common')
| -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; |