Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -17/+5 | |
|\ | ||||||
| * | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -17/+5 | |
| |\ | ||||||
| | * | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 | |
| | | * | Bug#48295: explain extended crash with subquery and ONLY_FULL_GROUP_BY sql | Tatiana A. Nurnberg | 2010-03-02 | 1 | -3/+8 | |
| | * | | Fixed following problems: | Sergey Glukhov | 2010-12-14 | 1 | -16/+4 | |
* | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -42/+44 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -5/+10 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Bug#56814 Explain + subselect + fulltext crashes server | Sergey Glukhov | 2010-10-18 | 1 | -5/+10 | |
| * | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -41/+38 | |
| |\ \ \ | | |/ / | ||||||
| | * | | merge of 5.1-bugteam into 5.1-security | Georgi Kodinov | 2010-10-06 | 1 | -30/+23 | |
| | |\ \ | ||||||
| | | * \ | Automerge. | Alexey Kopytov | 2010-09-09 | 1 | -1/+4 | |
| | | |\ \ | ||||||
| | | | * | | Bug #54190: Comparison to row subquery produces incorrect | Alexey Kopytov | 2010-09-09 | 1 | -1/+4 | |
| | | * | | | Bug#51070: Query with a NOT IN subquery predicate returns a wrong result set | Martin Hansson | 2010-09-07 | 1 | -29/+19 | |
| | | |/ / | ||||||
| | * | | | Bug#54488 crash when using explain and prepared statements with subqueries | Sergey Glukhov | 2010-10-01 | 1 | -11/+15 | |
| | |/ / | ||||||
* | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -9/+8 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -9/+8 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -9/+8 | |
* | | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -1/+2 | |
* | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -2/+21 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -0/+15 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Bug#52120 create view cause Assertion failed: 0, file .\item_subselect.cc, li... | Sergey Glukhov | 2010-04-06 | 1 | -0/+15 | |
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -2/+6 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Bug#47761: crash when killing a query during subquery execution... | Davi Arnaut | 2010-03-09 | 1 | -2/+6 | |
* | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -1/+7 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Fix a buildbot memory leak due to JOIN::destroy() not being called for EXPLAIN | unknown | 2010-03-09 | 1 | -0/+4 | |
| * | | | A number of after-merge fixes following merge of MySQL 5.1.44 into MariaDB. | unknown | 2010-03-09 | 1 | -1/+3 | |
* | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -0/+2 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -0/+2 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Auto-merged fix for the bug#34384. | Evgeny Potemkin | 2009-11-06 | 1 | -0/+2 | |
| | |\ \ | ||||||
| | | * | | Bug#34384: Slow down on constant conversion. | Evgeny Potemkin | 2009-11-06 | 1 | -0/+2 | |
* | | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -18/+19 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -18/+19 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | A fix and a test case for | Konstantin Osipov | 2009-11-03 | 1 | -0/+1 | |
| | |\ \ \ | | | | |/ | | | |/| | ||||||
| | | * | | A fix and a test case for | Konstantin Osipov | 2009-11-03 | 1 | -0/+1 | |
| | * | | | Bug#48295: explain extended crash with subquery and ONLY_FULL_GROUP_BY sql_mode | Tatiana A. Nurnberg | 2009-10-29 | 1 | -3/+8 | |
| | | |/ | | |/| | ||||||
| | * | | Fix for bug#46629: Item_in_subselect::val_int(): Assertion `0' | Ramil Kalimullin | 2009-09-04 | 1 | -6/+4 | |
* | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -12/+14 | |
|/ / / | ||||||
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -2/+28 | |
|\ \ \ | ||||||
| * | | | MWL#17: Table-elimination | Sergey Petrunya | 2009-09-01 | 1 | -2/+2 | |
| * | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-25 | 1 | -1/+1 | |
| * | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-22 | 1 | -2/+28 | |
* | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -0/+4 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | Merged fix for the bug#46051. | Evgeny Potemkin | 2009-07-19 | 1 | -0/+4 | |
| |\ \ | | |/ | ||||||
| | * | Bug#46051: Incorrectly market field caused wrong result. | Evgeny Potemkin | 2009-07-16 | 1 | -0/+4 | |
| | | | ||||||
| | \ | ||||||
| *-. \ | Merge from 5.0-bugteam for 43414 | Staale Smedseng | 2009-06-09 | 1 | -4/+4 | |
| |\ \ \ | | | |/ | ||||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-09 | 1 | -4/+4 | |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-09 | 1 | -4/+4 | |
| | |/ | ||||||
* | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -4/+4 | |
* | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -6/+32 | |
|\ \ \ | |/ / |