summaryrefslogtreecommitdiff
path: root/sql/field_conv.cc
Commit message (Expand)AuthorAgeFilesLines
* Merging from 5.3Alexander Barkov2013-07-081-2/+2
|\
| * MDEV-4667 DATE('string') incompability between mysql and mariadbSergei Golubchik2013-07-031-2/+2
| * mergeSergei Golubchik2012-04-051-1/+1
| |\
| | * mysql-5.1.62 mergeSergei Golubchik2012-04-051-1/+1
| | |\
| | | * Updated/added copyright headersKent Boortz2012-02-151-1/+1
| | | |\
* | | | \ mysql-5.5 mergeSergei Golubchik2012-06-141-1/+3
|\ \ \ \ \
| * \ \ \ \ Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-071-6/+7
| |\ \ \ \ \
* | \ \ \ \ \ cSergei Golubchik2012-05-211-4/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2Tor Didriksen2012-04-121-5/+6
| |/ / / / /
| * | | | | Merge BUG#12997905 from 5.1 to 5.5Jorgen Loland2011-11-181-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | Merge 5.3->5.5.Igor Babaev2012-03-011-0/+10
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fixed LP bug #939009.Igor Babaev2012-02-241-0/+10
* | | | | | 5.3 mergeSergei Golubchik2012-01-131-11/+35
|\ \ \ \ \ \ | |/ / / / /
| * | | | | BUG#912510: Crash in do_copy_not_null with semijoin=ON, firstmatch=ON, aggreg...Sergey Petrunya2012-01-081-1/+28
| * | | | | Merge with 5.2.Michael Widenius2011-12-111-11/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Backmerge of BUG#12997905Jorgen Loland2011-11-181-1/+1
| | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | |\ \ \ \ | | | |/ / /
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Bug#11908153: CRASH AND/OR VALGRIND ERRORS IN FIELD_BLOB::GET_KEY_IMAGETor Didriksen2011-07-041-0/+3
| * | | | | 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
| | | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-2/+2
* | | | | | merge with 5.3Sergei Golubchik2011-10-191-36/+72
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | field_conv.cc: added commentsSergey Petrunya2011-08-171-0/+14
| * | | | | various fixes for buildbot failuresSergei Golubchik2011-06-101-5/+3
| * | | | | merge with 5.1-microSergei Golubchik2011-06-071-17/+19
| |\ \ \ \ \
| | * | | | | revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-21/+38
| * | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-16/+28
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | db_low_byte_first is goneSergei Golubchik2011-05-201-10/+5
| | * | | | | * fix for ALTER TABLE ... MODIFY timestamp->timestamp.Sergei Golubchik2011-03-171-1/+11
| | | |/ / / | | |/| | |
| * | | | | Merge with 5.2Michael Widenius2011-03-091-3/+5
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-3/+5
| | |\ \ \ \ | | | |/ / /
| * | | | | Corrected the fix for LP bug 672551.Igor Babaev2010-11-121-9/+1
| * | | | | Fixed LP bug #672551.Igor Babaev2010-11-111-4/+17
| |/ / / /
* | | | | 5.5-mergeSergei Golubchik2011-07-021-5/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge of 5.1-bugteamGuilhem Bichot2010-11-221-5/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix for Bug#56138 "valgrind errors about overlapping memory when double-assig...Guilhem Bichot2010-11-221-5/+2
* | | | | merge.Sergei Golubchik2010-11-251-12/+9
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-8/+18
| |\ \ \ | | |/ /
| * | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-1/+1
| * | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-14/+11
* | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-1/+1
* | | | Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-191-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+2
* | | | Bug#48525: trigger changes "Column 'id' cannot be null" behaviourTatiana A. Nurnberg2010-03-291-8/+18
* | | | revert 48525Tatiana A. Nurnberg2010-02-221-18/+8
* | | | Bug#48525: trigger changes "Column 'id' cannot be null" behaviourTatiana A. Nurnberg2010-02-181-8/+18
|/ / /
| | |
| \ \
*-. \ \ Merge from 5.0-bugteam for 43414Staale Smedseng2009-06-091-6/+6
|\ \ \ \ | |_|/ / |/| | / | | |/