summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. anddlenev@mysql.com2005-01-281-11/+19
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2005-01-281-11/+19
| |\
| | * Fix for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() functiondlenev@brandersnatch.localdomain2005-01-261-11/+19
* | | Merge mysql.com:/home/mydev/mysql-4.1-4100ingo@mysql.com2005-01-271-5/+12
|\ \ \ | |/ /
| * | item_timefunc.cc:bar@mysql.com2005-01-271-5/+12
* | | mergedserg@serg.mylan2005-01-241-9/+14
|\ \ \ | |/ /
| * | fixes/cleanups according to Coverity reportserg@serg.mylan2005-01-241-9/+14
| * | Fix for bug #7586 "TIMEDIFF for sec+microsec not working properly".dlenev@brandersnatch.localdomain2005-01-121-20/+10
| |/
* | Porting fix for bug #7586 "TIMEDIFF for sec+microsec not working properly"dlenev@brandersnatch.localdomain2005-01-151-44/+35
* | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYmonty@mysql.com2005-01-031-5/+14
|\ \ | |/
| * Merged fixes for bug #7297 "Two digit year should be interpreted dlenev@brandersnatch.localdomain2004-12-301-0/+1
| * Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree.dlenev@mysql.com2004-12-301-5/+6
| |\
| | * Fix for bug #7515 "from_unixtime(0) now returns NULL instead ofdlenev@mysql.com2004-12-301-4/+6
| * | Fix for bug #6914 "Problems using time()/date() output in expressions".dlenev@brandersnatch.localdomain2004-12-301-0/+7
* | | manually mergedserg@sergbook.mysql.com2004-12-311-21/+39
|\ \ \ | |/ /
| * | Fix for bug #7458 "Microseconds are gobbled from the string result of dlenev@brandersnatch.localdomain2004-12-221-21/+39
* | | mergedserg@serg.mylan2004-11-201-24/+20
|\ \ \ | |/ /
| * | Manual merge of fix for bug #6439 "from_unixtime() function returnsdlenev@mysql.com2004-11-191-24/+20
| |\ \ | | |/
| | * Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime dlenev@mysql.com2004-11-151-34/+23
* | | mergebell@sanja.is.com.ua2004-11-121-2/+2
|\ \ \
| * | | errors without code removedbell@sanja.is.com.ua2004-10-201-2/+2
* | | | Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)brian@avenger.(none)2004-11-111-5/+8
|\ \ \ \ | | |/ / | |/| |
| * | | Fix for valgrind/purify for variables that the compiler touches but that does...monty@mysql.com2004-11-091-5/+8
* | | | Merge with 4.1 to get new thd->mem_root handlingmonty@mysql.com2004-11-081-4/+2
|\ \ \ \ | |/ / /
| * | | Simpler arena swapping codemonty@mysql.com2004-11-081-4/+2
* | | | Merge with 4.1 to get in latest bug fixesmonty@mysql.com2004-11-041-1/+3
|\ \ \ \ | |/ / /
| * | | A fix according to Monty's request:bar@mysql.com2004-10-291-1/+3
* | | | merge with 4.1monty@mysql.com2004-10-291-10/+25
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Bug#6202: ENUMs are not case sensitive even if declared BINARYbar@mysql.com2004-10-251-2/+2
| * | A fix and test case for Bug#6049 "Loss of sign when using prepared konstantin@mysql.com2004-10-161-7/+4
| * | Support for TIMESTAMP columns holding NULL values. Unlike all otherdlenev@brandersnatch.localdomain2004-10-011-1/+1
| * | Bug #5228 ORDER BY CAST(enumcol) sorts incorrectly under certain conditionsbar@mysql.com2004-09-071-0/+18
* | | Strict mode & better warningsmonty@mishka.local2004-09-281-22/+22
* | | Merge on pullmonty@mysql.com2004-09-091-39/+134
|\ \ \
| * \ \ Merge with 4.1monty@mysql.com2004-09-061-39/+134
| |\ \ \ | | |/ /
| | * | Portablity fix.dlenev@brandersnatch.localdomain2004-08-171-3/+8
| | * | Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes ...dlenev@brandersnatch.localdomain2004-08-101-9/+19
| | * | Fix for bug #4756 "STR_TO_DATE() returning bad results with AM/PM".dlenev@brandersnatch.localdomain2004-08-061-30/+110
* | | | fixed printing of characters casting operartion (BUG#5264)bell@sanja.is.com.ua2004-09-021-1/+1
|/ / /
* | | misc fixes for compile-time errorsserg@serg.mylan2004-07-211-1/+0
* | | Fix warnings in sql/item_timefunc.cc which popped up during windows builds.dlenev@brandersnatch.localdomain2004-07-161-2/+2
* | | Merge with 4.1.3-betamonty@mysql.com2004-07-071-128/+232
|\ \ \ | |/ /
| * | Fix for Bug#4030 "Client side conversion string -> date type doesn't konstantin@mysql.com2004-06-241-32/+34
| * | WL#1264 "Per-thread time zone support infrastructure".dlenev@brandersnatch.localdomain2004-06-181-95/+197
* | | Merging 4.1 to 5.0.pem@mysql.com2004-05-261-55/+22
|\ \ \ | |/ /
| * | Support for character set conversion in binary protocol: another gokonstantin@mysql.com2004-05-251-55/+22
* | | Merge 4.1 -> 5.0pem@mysql.com2004-05-071-66/+74
|\ \ \ | |/ /
| * | Portability fixesmonty@mysql.com2004-05-071-1/+1
| * | after merge fixesmonty@mysql.com2004-05-051-2/+3
| * | Merge with 4.0.19monty@mysql.com2004-05-051-65/+72
| |\ \ | | |/