diff options
| author | gkodinov@dl145s.mysql.com <> | 2006-11-27 16:25:52 +0100 |
|---|---|---|
| committer | gkodinov@dl145s.mysql.com <> | 2006-11-27 16:25:52 +0100 |
| commit | e74c9add4760d9bfb2638f4977dea25a0751fa0d (patch) | |
| tree | 08f5946df44304e74078c8398e52f0a45684cd67 /sql-common/my_time.c | |
| parent | 0421d489fbcdd1b9f3286f1981b7b3a275597b50 (diff) | |
| parent | 501333f694a0aaeeae1e9b0b8b5019d8c6357905 (diff) | |
| download | mariadb-git-e74c9add4760d9bfb2638f4977dea25a0751fa0d.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
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 7d12a49e40f..fb27fb74872 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -963,7 +963,7 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone, */ if ((tmp < TIMESTAMP_MIN_VALUE) || (tmp > TIMESTAMP_MAX_VALUE)) tmp= 0; -end: + return (my_time_t) tmp; } /* my_system_gmt_sec */ |