diff options
| author | Alexander Barkov <alexander.barkov@oracle.com> | 2012-01-24 13:24:05 +0400 |
|---|---|---|
| committer | Alexander Barkov <alexander.barkov@oracle.com> | 2012-01-24 13:24:05 +0400 |
| commit | b68dca488ac38bb8fcd88c5b8ae98fea9277f05e (patch) | |
| tree | e55f68f1430f8241de85d3bf1049c1cabdd62ce0 /sql-common | |
| parent | 323bfed31f5383ddea3acbf5d721ccf3eb38f830 (diff) | |
| parent | 1f776e9f24029d1620fa6b67a7f9945cb504ae8f (diff) | |
| download | mariadb-git-b68dca488ac38bb8fcd88c5b8ae98fea9277f05e.tar.gz | |
Merging BUG#13458237 from 5.1.
Diffstat (limited to 'sql-common')
| -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 feac016fa00..15627844a64 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -783,7 +783,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 */ |