summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-2/+3
|\
| * MDEV-10524 Assertion `arg1_int >= 0' failed in Item_func_additive_op::result_...Alexander Barkov2016-12-191-4/+25
* | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-211-4/+2
|\ \ | |/
| * MDEV-10052 Illegal mix of collations with DAYNAME(date_field)<>varchar_fieldAlexander Barkov2016-05-101-4/+2
* | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-2/+2
|\ \ | |/
| * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-091-1/+1
| |\
| | * Bug #21564557: INCONSISTENT OUTPUT FROM 5.5 AND 5.6Sreeharsha Ramanavarapu2015-12-311-4/+9
| | * Bug#13986705 CRASH IN GET_INTERVAL_VALUE() WITH DATE CALCULATION WITH UTF32 I...Tor Didriksen2012-05-211-76/+70
| | * Bug#13721076 CRASH WITH TIME TYPE/TIMESTAMP() AND WARNINGS IN SUBQUERYTor Didriksen2012-03-141-1/+1
| | * Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| | |\
| | | * Updated/added copyright headersKent Boortz2012-02-151-1/+1
| | | |\
| | * | \ Merging BUG#13458237 from 5.1.Alexander Barkov2012-01-241-1/+1
| | |\ \ \ | | | |/ /
| | | * | BUG#13458237 - INCONSISTENT HANDLING OF INVALIDE DATES WITH ZERO DAY. SIMILAR...Alexander Barkov2012-01-241-1/+1
| | * | | 5.1 -> 5.5 mergeSergey Glukhov2011-07-271-1/+1
| | |\ \ \ | | | |/ /
| | | * | Bug#12584302 AFTER FIX FOR #12403504: ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP...Sergey Glukhov2011-07-271-1/+1
| | | * | Updated/added copyright headersKent Boortz2011-07-031-8/+27
| | | |\ \
| | * | \ \ Merge from mysql-5.5.14-releasehery.ramilison@oracle.com2011-07-061-1/+1
| | |\ \ \ \
| | | * \ \ \ merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-06-061-2/+7
| | | |\ \ \ \
| | | * \ \ \ \ weave merge of mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-05-101-3/+3
| | | |\ \ \ \ \
| | | * | | | | | Bug#12340997 - DATE_ADD/DATE_SUB WITH INTERVAL CRASHES IN GET_INTERVAL_VALUE()Tor Didriksen2011-04-281-1/+1
| | * | | | | | | Updated/added copyright headersKent Boortz2011-07-041-1/+22
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ mergeMattias Jonsson2011-06-131-0/+20
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | | * | | | | | Bug#11746819:Mattias Jonsson2011-03-161-0/+20
| | * | | | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | / / / | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | / | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | * | | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-05-181-2/+7
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | Bug#12403504 AFTER FIX FOR #11889186 : ASSERTION FAILED: DELSUM+(INT) Y/4-TEM...Sergey Glukhov2011-05-181-2/+7
| | | * | | | Merge from mysql-5.1.57-releaseKaren Langford2011-05-061-0/+13
| | | |\ \ \ \
| | | | * \ \ \ merged mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-04-071-2/+3
| | | | |\ \ \ \
| | * | | \ \ \ \ Merge from mysql-5.5.12-releasebjorn.munch@oracle.com2011-05-061-0/+13
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | merge 5.5->5.5-securityGeorgi Kodinov2011-04-071-2/+3
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ auto-mergeGeorgi Kodinov2011-03-151-0/+13
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Bug #11765023: 57934: DOS POSSIBLE SINCE BINARY CASTING DOESN'T Georgi Kodinov2011-03-151-0/+13
| | | | | |_|_|/ / | | | | |/| | | |
| | * | | | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-04-271-3/+3
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | / / / | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Bug#11889186 60503: CRASH IN MAKE_DATE_TIME WITH DATE_FORMAT / STR_TO_DATE C...Sergey Glukhov2011-04-271-3/+3
| | | | |_|/ / | | | |/| | |
| | * | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-03-281-0/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug#11765216 58154: UNINITIALIZED VARIABLE FORMAT IN STR_TO_DATE FUNCTIONSergey Glukhov2011-03-281-0/+1
| | * | | | | 5.1->5.5 mergeSergey Glukhov2011-03-281-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | |
| | | * | | Bug#11766112 59151:UNINITIALIZED VALUES IN EXTRACT_DATE_TIME WITH STR_TO_DATE...Sergey Glukhov2011-03-281-2/+2
| | | |/ /
| | * | | BUG#11766720 - setting storage engine to null segfaults mysqldSergey Vojtovich2011-02-181-8/+5
| | * | | Bug#31384 DATE_ADD() and DATE_SUB() return binary dataAlexander Barkov2011-02-101-3/+16
| | * | | Auto-merge from mysql-5.5.7-rc-release.Alexander Nozdrin2010-11-251-1/+1
| | |\ \ \
| | | * | | Bug#57512 str_to_date crash...Oystein Grovlen2010-10-201-1/+1
| | * | | | Merging from mysql-5.1-securityAlexander Barkov2010-11-121-7/+7
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Bug#58005 utf8 + get_format causes failed assertion: !str || str != Ptr'Alexander Barkov2010-11-121-7/+7
| | * | | Auto-merged.Evgeny Potemkin2010-10-071-2/+2
| | |\ \ \
| | | * \ \ Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam.Alexey Kopytov2010-10-021-2/+2
| | | |\ \ \ | | | | |/ /
| | | | * | Bug #56709: Memory leaks at running the 5.1 test suiteAlexey Kopytov2010-09-221-2/+2
| | * | | | Bug#57039: constant subtime expression returns incorrect result.Evgeny Potemkin2010-10-071-20/+50
| | |/ / /