mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 08:15:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge with mysql-5.5.21

Browse source
This commit is contained in:
Sergei Golubchik 2012-03-09 08:06:59 +01:00
commit 4933d21e5d
127 changed files with 3502 additions and 1548 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql-common/my_time.c
View file

@ -804,7 +804,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 */