Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge from 5.1 | Chaithra Gopalareddy | 2012-12-24 | 1 | -4/+4 |
|\ | |||||
| * | Bug#11757005: UNION CONVERTS UNSIGNED MEDIUMINT AND BIGINT | Chaithra Gopalareddy | 2012-12-24 | 1 | -4/+4 |
* | | auto-merge | Gleb Shchepa | 2012-06-29 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor update to make MSVS happy | Gleb Shchepa | 2012-06-29 | 1 | -1/+1 |
* | | manual merge (WL6219) | Gleb Shchepa | 2012-06-29 | 1 | -0/+11 |
|\ \ | |/ | |||||
| * | Backport of the deprecation warning from WL#6219: "Deprecate and remove YEAR(... | Gleb Shchepa | 2012-06-29 | 1 | -0/+11 |
| * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -9/+11 |
| |\ | |||||
| * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| |\ \ | |||||
| | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| | * | | automerge | Georgi Kodinov | 2011-01-07 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | backport: Bug #55568 from 5.1-security to 5.0-security | Gleb Shchepa | 2010-11-23 | 1 | -1/+1 |
* | | | | | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 1 | -2/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2 | Tor Didriksen | 2012-04-12 | 1 | -1/+13 |
|/ / / / / | |||||
* | | | | | Bug#13832953 MY_STRNXFRM_UNICODE: ASSERTION `SRC' FAILED. | MY_STRNXFRM_UNIC... | Alexander Barkov | 2012-03-20 | 1 | -2/+1 |
* | | | | | Backport from trunk of: | Tor Didriksen | 2011-08-19 | 1 | -1/+2 |
* | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -2/+4 |
* | | | | | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -7/+6 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -7/+6 |
| * | | | | auto-merge | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -0/+2 |
| |\ \ \ \ | |||||
* | \ \ \ \ | auto-merge | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | 5.1 -> 5.5 merge | Sergey Glukhov | 2011-04-12 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Bug#11766270 59343: YEAR(4): INCORRECT RESULT AND VALGRIND WARNINGS WITH MIN/... | Sergey Glukhov | 2011-04-12 | 1 | -0/+2 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | auto-merge Bug#11762799/Bug#55436 | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -3/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | auto-merge Bug#11762799/Bug#55436 | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -3/+3 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | auto-merge conservative fix for Bug#55436/Bug#11762799 | Tatiana Azundris Nurnberg | 2011-05-05 | 1 | -3/+3 |
| | |\ \ \ | |||||
| | | * | | | Bug#55436: buffer overflow in debug binary of dbug_buff in Field_new_decimal:... | Tatiana A. Nurnberg | 2010-11-11 | 1 | -3/+3 |
* | | | | | | Merged fix for bug #58650 "Failing assertion: | Dmitry Lenev | 2011-02-02 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fix for bug #58650 "Failing assertion: primary_key_no == -1 || | Dmitry Lenev | 2011-02-02 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
* | | | | Bug #58137 char(0) column cause: my_gcvt: Assertion `width > 0 && to != ((voi... | Tor Didriksen | 2010-11-17 | 1 | -3/+6 |
* | | | | Bug #52131: SET and ENUM stored endian-dependent in binary log | Tor Didriksen | 2010-10-29 | 1 | -0/+4 |
* | | | | Merging patch for BUG#52131 with mysql-5.5-bugteam. | Mats Kindahl | 2010-10-27 | 1 | -8/+45 |
|\ \ \ \ | |||||
| * | | | | Bug #52131: SET and ENUM stored endian-dependent in binary log | Mats Kindahl | 2010-10-06 | 1 | -8/+45 |
* | | | | | Bug #57203 Assertion `field_length <= 255' failed. | Tor Didriksen | 2010-10-19 | 1 | -2/+2 |
* | | | | | merge | Georgi Kodinov | 2010-09-29 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | merge 5.1-security => 5.5-security | Kristofer Pettersson | 2010-09-08 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug#55531 crash with conversions of geometry types / strings | Kristofer Pettersson | 2010-09-07 | 1 | -1/+1 |
| * | | | | merge from 5.5-merge | Georgi Kodinov | 2010-09-02 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Automerge. | Alexey Kopytov | 2010-08-26 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Bug #55568: user variable assignments crash server when used | Alexey Kopytov | 2010-08-24 | 1 | -1/+1 |
| | | |_|/ | | |/| | | |||||
* | | | | | Auto-merge from mysql-5.5-merge. | Alexander Nozdrin | 2010-09-28 | 1 | -5/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Bug#55077: Assertion failed: width > 0 && to != ((void *)0), | Alexey Kopytov | 2010-08-25 | 1 | -5/+16 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merging into mysql-5.5-bugfixing. | Mats Kindahl | 2010-09-23 | 1 | -2/+3 |
|/ / / / | |||||
* | | | | Bug#52121 partition by key on utf32 enum field cause debug assertion: (length... | Alexander Barkov | 2010-08-23 | 1 | -1/+1 |
|/ / / | |||||
* | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-07-29 | 1 | -2/+0 |
|\ \ \ | |||||
| * \ \ | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-20 | 1 | -2/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -2/+0 |
* | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -19/+19 |