diff options
| author | unknown <petr/cps@outpost.site> | 2006-11-06 00:00:44 +0300 |
|---|---|---|
| committer | unknown <petr/cps@outpost.site> | 2006-11-06 00:00:44 +0300 |
| commit | fd4b510eca6463985e74ab228346d0e3a7ba0c33 (patch) | |
| tree | 45342fb2376c78b5d2135a4cc89cd1bb740807da /sql/tztime.cc | |
| parent | 60e315c53d60d1337f71405472189bb353100237 (diff) | |
| parent | c96eaa43ab1c486fb729ca099ccdb1f7336525eb (diff) | |
| download | mariadb-git-fd4b510eca6463985e74ab228346d0e3a7ba0c33.tar.gz | |
Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
into outpost.site:/home/cps/mysql/trees/5.1-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 8c44e4e4f9f..3d9f278b3f7 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -903,7 +903,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 */ |