summaryrefslogtreecommitdiff
path: root/sql/field.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge from 5.1Chaithra Gopalareddy2012-12-241-4/+4
|\
| * Bug#11757005: UNION CONVERTS UNSIGNED MEDIUMINT AND BIGINTChaithra Gopalareddy2012-12-241-4/+4
* | auto-mergeGleb Shchepa2012-06-291-1/+1
|\ \ | |/
| * minor update to make MSVS happyGleb Shchepa2012-06-291-1/+1
* | manual merge (WL6219)Gleb Shchepa2012-06-291-0/+11
|\ \ | |/
| * Backport of the deprecation warning from WL#6219: "Deprecate and remove YEAR(...Gleb Shchepa2012-06-291-0/+11
| * Updated/added copyright headersKent Boortz2011-07-031-9/+11
| |\
| * \ Updated/added copyright headersKent Boortz2011-06-301-2/+3
| |\ \
| | * | Updated/added copyright headersKent Boortz2011-06-301-1/+1
| | * | automergeGeorgi Kodinov2011-01-071-1/+1
| | |\ \
| | * | | backport: Bug #55568 from 5.1-security to 5.0-securityGleb Shchepa2010-11-231-1/+1
* | | | | Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-071-2/+14
|\ \ \ \ \
| * | | | | Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2Tor Didriksen2012-04-121-1/+13
|/ / / / /
* | | | | Bug#13832953 MY_STRNXFRM_UNICODE: ASSERTION `SRC' FAILED. | MY_STRNXFRM_UNIC...Alexander Barkov2012-03-201-2/+1
* | | | | Backport from trunk of:Tor Didriksen2011-08-191-1/+2
* | | | | Updated/added copyright headersKent Boortz2011-07-041-2/+4
* | | | | Merge from 5.1.Guilhem Bichot2011-05-211-7/+6
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-161-7/+6
| * | | | auto-mergeTatjana Azundris Nuernberg2011-05-121-0/+2
| |\ \ \ \
* | \ \ \ \ auto-mergeTatjana Azundris Nuernberg2011-05-121-0/+2
|\ \ \ \ \ \
| * \ \ \ \ \ 5.1 -> 5.5 mergeSergey Glukhov2011-04-121-0/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Bug#11766270 59343: YEAR(4): INCORRECT RESULT AND VALGRIND WARNINGS WITH MIN/...Sergey Glukhov2011-04-121-0/+2
| | | |/ / / | | |/| | |
* | | | | | auto-merge Bug#11762799/Bug#55436Tatjana Azundris Nuernberg2011-05-121-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | auto-merge Bug#11762799/Bug#55436Tatjana Azundris Nuernberg2011-05-121-3/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | auto-merge conservative fix for Bug#55436/Bug#11762799Tatiana Azundris Nurnberg2011-05-051-3/+3
| | |\ \ \
| | | * | | Bug#55436: buffer overflow in debug binary of dbug_buff in Field_new_decimal:...Tatiana A. Nurnberg2010-11-111-3/+3
* | | | | | Merged fix for bug #58650 "Failing assertion:Dmitry Lenev2011-02-021-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix for bug #58650 "Failing assertion: primary_key_no == -1 ||Dmitry Lenev2011-02-021-0/+1
| |/ / / /
* | | | | MergeKent Boortz2010-12-291-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | MergeKent Boortz2010-12-291-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | - Added/updated copyright headersKent Boortz2010-12-281-1/+1
| | | |/ | | |/|
* | | | Bug #58137 char(0) column cause: my_gcvt: Assertion `width > 0 && to != ((voi...Tor Didriksen2010-11-171-3/+6
* | | | Bug #52131: SET and ENUM stored endian-dependent in binary logTor Didriksen2010-10-291-0/+4
* | | | Merging patch for BUG#52131 with mysql-5.5-bugteam.Mats Kindahl2010-10-271-8/+45
|\ \ \ \
| * | | | Bug #52131: SET and ENUM stored endian-dependent in binary logMats Kindahl2010-10-061-8/+45
* | | | | Bug #57203 Assertion `field_length <= 255' failed.Tor Didriksen2010-10-191-2/+2
* | | | | mergeGeorgi Kodinov2010-09-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | merge 5.1-security => 5.5-securityKristofer Pettersson2010-09-081-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Bug#55531 crash with conversions of geometry types / stringsKristofer Pettersson2010-09-071-1/+1
| * | | | merge from 5.5-mergeGeorgi Kodinov2010-09-021-1/+1
| |\ \ \ \
| * \ \ \ \ Automerge.Alexey Kopytov2010-08-261-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug #55568: user variable assignments crash server when usedAlexey Kopytov2010-08-241-1/+1
| | | |_|/ | | |/| |
* | | | | Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-09-281-5/+16
|\ \ \ \ \
| * | | | | Bug#55077: Assertion failed: width > 0 && to != ((void *)0),Alexey Kopytov2010-08-251-5/+16
| | |_|/ / | |/| | |
* | | | | Merging into mysql-5.5-bugfixing.Mats Kindahl2010-09-231-2/+3
|/ / / /
* | | | Bug#52121 partition by key on utf32 enum field cause debug assertion: (length...Alexander Barkov2010-08-231-1/+1
|/ / /
* | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-2/+0
|\ \ \
| * \ \ Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-2/+0
| |\ \ \ | | |/ /
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-2/+0
* | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-19/+19