Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -4/+2 | |
|\ | ||||||
| * | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -4/+2 | |
| |\ | ||||||
| | * | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 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 | |
* | | | | 5.2 merge | Sergei Golubchik | 2010-10-28 | 1 | -22/+4 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -22/+4 | |
| |\ \ \ | | |/ / | ||||||
| | * | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -22/+4 | |
| | |\ \ | | | |/ | ||||||
| | | * | 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 | |
| | | |\ | ||||||
| | | * | | Bug #55580 : segfault in read_view_sees_trx_id | Georgi Kodinov | 2010-08-13 | 1 | -2/+4 | |
* | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -10/+54 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -4/+18 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -4/+18 | |
| * | | | | Fixed bugs (mostly on sparc) that caused crashes in mysql-test-run | Michael Widenius | 2010-09-03 | 1 | -3/+2 | |
| * | | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -1/+18 | |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | ||||||
| | * | | Bug #54476: crash when group_concat and 'with rollup' in | Alexey Kopytov | 2010-07-23 | 1 | -1/+18 | |
| | |/ | ||||||
| * | | Fix for LP#612894 Some aggregate functions (such as MIN MAX) work incorrectly... | Michael Widenius | 2010-08-23 | 1 | -2/+16 | |
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -2/+2 | |
| |\ \ | | |/ | ||||||
| | * | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -2/+2 | |
* | | | Subquery cache (MWL#66) added. | unknown | 2010-07-10 | 1 | -0/+1 | |
* | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -7/+9 | |
|\ \ \ | |/ / | ||||||
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -7/+9 | |
| |\ \ | | |/ | ||||||
| | * | Fix for bug#52397: another crash with explain extended and group_concat | Ramil Kalimullin | 2010-03-31 | 1 | -1/+1 | |
| | * | Bug #49829 Many "hides virtual function" warnings with | Staale Smedseng | 2010-03-14 | 1 | -5/+5 | |
| | * | manual merge | Tatiana A. Nurnberg | 2010-02-19 | 1 | -1/+3 | |
| | |\ | ||||||
| | | * | Bug#49487: crash with explain extended and group_concat in a derived table | Tatiana A. Nurnberg | 2010-02-19 | 1 | -1/+3 | |
| * | | | Fixed compiler warnings and sporadic failures in test cases | Michael Widenius | 2010-03-28 | 1 | -4/+4 | |
* | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -230/+59 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -231/+59 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Auto-merge. | Evgeny Potemkin | 2009-11-24 | 1 | -4/+2 | |
| | |\ \ | ||||||
| | | * | | Bug #45261 : Crash, stored procedure + decimal | Georgi Kodinov | 2009-11-20 | 1 | -4/+2 | |
| | * | | | Manual merge of the fix for bug#43668. | Evgeny Potemkin | 2009-11-24 | 1 | -227/+57 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | Bug#43668: Wrong comparison and MIN/MAX for YEAR(2) | Evgeny Potemkin | 2009-11-17 | 1 | -227/+56 | |
| * | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+2 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Bug#48370: Absolutely wrong calculations with GROUP BY and decimal fields whe... | Davi Arnaut | 2009-11-02 | 1 | -1/+2 | |
| | |/ / | ||||||
* | | | | BUG#31480: Incorrect result for nested subquery when executed via semi join | Sergey Petrunya | 2010-02-12 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -2/+1 | |
|\ \ \ | |/ / | ||||||
| * | | Bug#45261: Crash, stored procedure + decimal | Davi Arnaut | 2009-08-24 | 1 | -2/+1 | |
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -6/+1 | |
|\ \ \ | ||||||
| * | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-22 | 1 | -1/+1 | |
| * | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-10 | 1 | -5/+0 | |
* | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -6/+14 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | automerge | Georgi Kodinov | 2009-07-10 | 1 | -0/+5 | |
| |\ \ | | |/ | ||||||
| | * | Bug #46080: group_concat(... order by) crashes server when | Georgi Kodinov | 2009-07-10 | 1 | -0/+5 | |
| * | | Manual merge. | Alexey Kopytov | 2009-07-03 | 1 | -6/+9 | |
| |\ \ | ||||||
| | * | | Bug #45262: Bad effects with CREATE TABLE and DECIMAL | Alexey Kopytov | 2009-07-03 | 1 | -6/+9 | |
| | |/ | ||||||
| | | | ||||||
| | \ | ||||||
| *-. \ | Merge from 5.0-bugteam for 43414 | Staale Smedseng | 2009-06-09 | 1 | -2/+2 | |
| |\ \ \ | | | |/ | ||||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-09 | 1 | -6/+6 | |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-09 | 1 | -6/+6 | |
| | |/ | ||||||
* | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -1/+2 | |
|\ \ \ | |/ / |