diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 21:45:16 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 21:45:16 +0100 |
| commit | 46b0cf80477b6177b502e207e92d5216bfdf30a3 (patch) | |
| tree | c158b10ebdd3c5772e60cfbcc0aa949373ccc103 /sql-common/my_time.c | |
| parent | 77435f0fbd79df432a2e617d143fb3e2895192d0 (diff) | |
| parent | 8639ad0f9857053a996e6a40d46126eceb9c2f0c (diff) | |
| download | mariadb-git-46b0cf80477b6177b502e207e92d5216bfdf30a3.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/mysql-5.0-merge
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 fb27fb74872..efef1d98673 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; |