Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 5.3->5.5. | Igor Babaev | 2012-03-01 | 1 | -1/+0 |
|\ | |||||
| * | Rolled back the patch for bug 791761. | Igor Babaev | 2012-02-26 | 1 | -1/+0 |
* | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -0/+1 |
|\ \ | |||||
| * | | Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULT | Sergey Glukhov | 2011-10-12 | 1 | -0/+1 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ \ | |||||
| | * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| | |\ \ | |||||
| | | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | |\ \ | |||||
* | | | \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+3 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | * | | | | backported the fix for bug #34773 to 5.0 | Georgi Kodinov | 2008-12-09 | 1 | -7/+18 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -8/+9 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Fixed LP bug #791761. | Igor Babaev | 2011-07-20 | 1 | -0/+1 |
| * | | | | | | Fixed LP BUG#800696. | unknown | 2011-07-19 | 1 | -0/+1 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -0/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+1 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -6/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -6/+6 |
| | |\ \ \ \ | |||||
| * | | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -2/+7 |
* | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -18/+41 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Backport of fix for Bug#52123 | Tor Didriksen | 2011-02-02 | 1 | -7/+5 |
| * | | | | | | Merging from mysql-5.1 | Alexander Barkov | 2011-01-17 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Bug#59149 valgrind warnings with "like .. escape .." function | Alexander Barkov | 2011-01-17 | 1 | -0/+1 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | 5.1-bugteam->5.5-bugteam merge | Sergey Glukhov | 2010-12-21 | 1 | -5/+5 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug#58030 crash in Item_func_geometry_from_text::val_str | Sergey Glukhov | 2010-12-21 | 1 | -5/+5 |
| * | | | | | Bug #57954: BIT_AND function returns incorrect results | Georgi Kodinov | 2010-12-08 | 1 | -6/+14 |
| * | | | | | Fix for Bug#57932 "query with avg returns incorrect results": | Guilhem Bichot | 2010-12-07 | 1 | -0/+16 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -0/+29 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -1/+0 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -1/+0 |
| | |\ \ \ | | | |/ / | |||||
| * | | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -1/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix for LP#612894 Some aggregate functions (such as MIN MAX) work incorrectly... | Michael Widenius | 2010-08-23 | 1 | -1/+3 |
| * | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -1/+1 |
| | |\ \ \ | |||||
| * | \ \ \ | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -3/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -3/+3 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fixed compiler warnings and sporadic failures in test cases | Michael Widenius | 2010-03-28 | 1 | -1/+1 |
| * | | | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -23/+14 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -23/+14 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+12 |
| |/ / / / / / | |||||
| * | | | | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-25 | 1 | -3/+4 |
| * | | | | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-10 | 1 | -0/+14 |
* | | | | | | | Automerge. | Alexey Kopytov | 2010-08-30 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Bug #54465: assert: field_types == 0 || field_types[field_pos] | Alexey Kopytov | 2010-08-27 | 1 | -1/+0 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Bug#49771: Incorrect MIN/MAX for date/time values. | Evgeny Potemkin | 2010-07-19 | 1 | -0/+5 |
* | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -1/+1 |
| | |_|/ / | |/| | | |