diff options
| author | unknown <kent@kent-amd64.(none)> | 2006-11-29 14:28:05 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2006-11-29 14:28:05 +0100 |
| commit | e93a20a5fc4a968e011fd6137baa2fbb790b5278 (patch) | |
| tree | 0ee6eeb1f7181479368c403d8a440911cfc29516 /sql-common | |
| parent | b51cf266293929dec21e41bdc97c4eead4884f0e (diff) | |
| parent | 412d284e063471a17d4e445a9c80b9b0d1c40182 (diff) | |
| download | mariadb-git-e93a20a5fc4a968e011fd6137baa2fbb790b5278.tar.gz | |
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
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 886be050bf0..f836da2147e 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; |