summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2006-11-27 23:12:05 +0100
committerkent@kent-amd64.(none) <>2006-11-27 23:12:05 +0100
commite99c548bcd414b2149ce7c1a09619101d765dfd0 (patch)
treebb94dba41000bf4e2bcc5bd5ebbfe118fb9db103 /sql-common
parentfc49099e2072eeeaa935da879b4ae22f15a7ade9 (diff)
parent5fcb7a4ef11df88f963f41252121fabc7e39b5c1 (diff)
downloadmariadb-git-e99c548bcd414b2149ce7c1a09619101d765dfd0.tar.gz
Merge mysql.com:/home/kent/bk/mysql-5.0
into mysql.com:/home/kent/bk/mysql-5.1
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/my_time.c2
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;