diff options
| author | unknown <petr/cps@outpost.site> | 2006-11-05 23:31:42 +0300 |
|---|---|---|
| committer | unknown <petr/cps@outpost.site> | 2006-11-05 23:31:42 +0300 |
| commit | c96eaa43ab1c486fb729ca099ccdb1f7336525eb (patch) | |
| tree | d0495d55becc934376801c4ce215d4a947406f4b /sql/tztime.cc | |
| parent | b2c40c169869f7df93342b434b84af4fb26acbe2 (diff) | |
| parent | e32e7ca0603a70a260194de269899882dd5b8f3a (diff) | |
| download | mariadb-git-c96eaa43ab1c486fb729ca099ccdb1f7336525eb.tar.gz | |
Merge outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
into outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
sql/tztime.cc:
Auto merged
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 15cd862f4b9..bd8e43075c4 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -891,7 +891,7 @@ TIME_to_gmt_sec(const TIME *t, const TIME_ZONE_INFO *sp, DBUG_ENTER("TIME_to_gmt_sec"); if (!validate_timestamp_range(t)) - return 0; + DBUG_RETURN(0); /* We need this for correct leap seconds handling */ |