diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 23:07:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 23:07:18 +0200 |
| commit | a3073ecd96a829aaff87c6386e0766fc1440922b (patch) | |
| tree | d91e26efc46ab64ee6cb8de880eac060cded0213 /sql-common/my_time.c | |
| parent | 1a48919036a7746a15ff6bd19cb52c25fc6a57c1 (diff) | |
| parent | cbd52a42ee9b93675e5cdaa043df878c423b6571 (diff) | |
| download | mariadb-git-a3073ecd96a829aaff87c6386e0766fc1440922b.tar.gz | |
merge
Diffstat (limited to 'sql-common/my_time.c')
| -rw-r--r-- | sql-common/my_time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 759d5709f89..b009f8da7b9 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, 2011, Oracle and/or its affiliates. + Copyright (c) 2004, 2012, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -807,7 +807,7 @@ long calc_daynr(uint year,uint month,uint day) temp=(int) ((y/100+1)*3)/4; DBUG_PRINT("exit",("year: %d month: %d day: %d -> daynr: %ld", y+(month <= 2),month,day,delsum+y/4-temp)); - DBUG_ASSERT(delsum+(int) y/4-temp > 0); + DBUG_ASSERT(delsum+(int) y/4-temp >= 0); DBUG_RETURN(delsum+(int) y/4-temp); } /* calc_daynr */ |