Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-08-05 | 1 | -2/+3 |
|\ | |||||
| * | correct the NULL-pointer testmariadb-5.5.45 | Sergei Golubchik | 2015-08-04 | 1 | -2/+3 |
* | | Merge commit '96badb16afcf' into 10.0 | Jan Lindström | 2015-08-03 | 1 | -3/+10 |
|\ \ | |/ | |||||
| * | MDEV-7821 Server crashes in Item_func_group_concat::fix_fields on 2nd executi... | Sergei Golubchik | 2015-07-31 | 1 | -6/+10 |
| * | MDEV-7821 - Server crashes in Item_func_group_concat::fix_fields on 2nd | Sergey Vojtovich | 2015-07-31 | 1 | -0/+3 |
* | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -3/+15 |
|\ \ | |/ | |||||
| * | Merge tag 'mysql-5.5.44' into bb-5.5-serg | Sergei Golubchik | 2015-06-05 | 1 | -3/+15 |
| |\ | |||||
| | * | Bug #19814337 - SERVER CRASHES IN ITEM_FUNC_GROUP_CONCAT::FIX_FIELDS ON | Chaithra Gopalareddy | 2015-02-26 | 1 | -1/+14 |
| | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
| | * | Bug#16539979 - BASIC SELECT COUNT(DISTINCT ID) IS BROKEN | Guilhem Bichot | 2013-12-04 | 1 | -22/+45 |
| | * | Bug#17222452 - SELECT COUNT(DISTINCT A,B) INCORRECTLY COUNTS ROWS | Neeraj Bisht | 2013-09-04 | 1 | -2/+6 |
| | * | Merge from 5.1 to 5.5 | Chaithra Gopalareddy | 2013-04-14 | 1 | -3/+4 |
| | |\ | |||||
| | | * | Bug#16347426:ASSERTION FAILED: (SELECT_INSERT && | Chaithra Gopalareddy | 2013-04-14 | 1 | -3/+4 |
| | * | | Merge from 5.1 to 5.5 | Chaithra Gopalareddy | 2013-03-31 | 1 | -38/+50 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #16347343 : CRASH, GROUP_CONCAT, DERIVED TABLES | Chaithra Gopalareddy | 2013-03-31 | 1 | -38/+50 |
| | | * | Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
| | * | | 5.1 -> 5.5 merge | Sergey Glukhov | 2013-03-14 | 1 | -1/+8 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#16075310 SERVER CRASH OR VALGRIND ERRORS IN ITEM_FUNC_GROUP_CONCAT::SETUP... | Sergey Glukhov | 2013-03-14 | 1 | -1/+8 |
| | | * | Merge from mysql-5.1.58-release | Karen Langford | 2011-07-06 | 1 | -3/+3 |
| | | |\ | |||||
| | | | * | weave merge of mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-05-10 | 1 | -5/+1 |
| | | | |\ | |||||
| | | * | \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -6/+2 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | * | | | | Bug#11757464:SERVER CRASH IN RECURSIVE CALL WHEN OOM | Nisha Gopalakrishnan | 2013-01-15 | 1 | -0/+4 |
| | * | | | | Bug#15972635: Incorrect results returned in 32 table join with HAVING | Roy Lyseng | 2012-12-21 | 1 | -6/+9 |
| | * | | | | Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULT | Sergey Glukhov | 2011-10-12 | 1 | -0/+25 |
| | * | | | | Merge from mysql-5.5.14-release | hery.ramilison@oracle.com | 2011-07-06 | 1 | -3/+3 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | weave merge of mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-05-10 | 1 | -5/+1 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | merge 5.1 => 5.5 : Bug#12329653 | Tor Didriksen | 2011-05-05 | 1 | -3/+3 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | | * | | | | merge 5.0 => 5.1 : Bug#12329653 | Tor Didriksen | 2011-05-04 | 1 | -3/+3 |
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | | | |||||
| | | | | * | | | Bug#12329653 - EXPLAIN, UNION, PREPARED STATEMENT, CRASH, SQL_FULL_GROUP_BY | Tor Didriksen | 2011-05-04 | 1 | -3/+3 |
| | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | / / | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | 5.1 -> 5.5 merge | Sergey Glukhov | 2011-04-12 | 1 | -5/+1 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| | | |||||
| | | * | | | Bug#11766270 59343: YEAR(4): INCORRECT RESULT AND VALGRIND WARNINGS WITH MIN/... | Sergey Glukhov | 2011-04-12 | 1 | -5/+1 |
| | | |/ / | |||||
| | * | | | Bug #59686 crash in String::copy() with time data type | Tor Didriksen | 2011-02-11 | 1 | -4/+16 |
| | * | | | Backport of fix for Bug#52123 | Tor Didriksen | 2011-02-02 | 1 | -9/+12 |
| | * | | | 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 |
| | | | * | backport of bug #54476 fix from 5.1-bugteam to 5.0-bugteam. | Gleb Shchepa | 2010-12-14 | 1 | -1/+18 |
| | * | | | 5.1-bugteam->5.5-bugteam merge | Sergey Glukhov | 2010-12-21 | 1 | -9/+11 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#58030 crash in Item_func_geometry_from_text::val_str | Sergey Glukhov | 2010-12-21 | 1 | -9/+11 |
| | * | | | 5.1-bugteam->5.5-bugteam merge | Sergey Glukhov | 2010-12-13 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#58396 group_concat and explain extended are still crashy | Sergey Glukhov | 2010-12-13 | 1 | -1/+1 |
| | * | | | Bug #57954: BIT_AND function returns incorrect results | Georgi Kodinov | 2010-12-08 | 1 | -1/+1 |
| | * | | | Fix for Bug#57932 "query with avg returns incorrect results": | Guilhem Bichot | 2010-12-07 | 1 | -39/+45 |
| | * | | | merge | Georgi Kodinov | 2010-11-26 | 1 | -4/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#57194 group_concat cause crash and/or invalid memory reads with type errors | Sergey Glukhov | 2010-10-29 | 1 | -4/+2 |
| | * | | | Automerge. | Alexey Kopytov | 2010-08-30 | 1 | -20/+0 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #54465: assert: field_types == 0 || field_types[field_pos] | Alexey Kopytov | 2010-08-27 | 1 | -20/+0 |
| | * | | | merge | Georgi Kodinov | 2010-08-20 | 1 | -1/+18 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | merge | Georgi Kodinov | 2010-08-20 | 1 | -1/+18 |
| | | |\ \ |