Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -13/+11 |
|\ | |||||
| * | 5.2->5.3 merge | Sergei Golubchik | 2011-11-12 | 1 | -1/+1 |
| |\ | |||||
| | * | 5.1 merge | Sergei Golubchik | 2011-11-12 | 1 | -1/+1 |
| | |\ | |||||
| | | * | typos fixed | Sergei Golubchik | 2011-11-08 | 1 | -1/+1 |
| * | | | BUG#882472: subselect4.test fails in current 5.3 | Sergey Petrunya | 2011-10-27 | 1 | -10/+8 |
* | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -10/+2 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge from 5.2 | unknown | 2011-07-21 | 1 | -9/+0 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge 5.1->5.2 | unknown | 2011-07-21 | 1 | -9/+0 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Removed incorrect fix and its test suite (the test suit is duplicate). | unknown | 2011-07-21 | 1 | -9/+0 |
| * | | | | | | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -1/+2 |
| * | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -0/+9 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+9 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
* | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | 5.1-bugteam->5.5-bugteam merge | Sergey Glukhov | 2010-11-23 | 1 | -0/+9 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Bug#56862 Execution of a query that uses index merge returns a wrong result | Sergey Glukhov | 2010-11-23 | 1 | -0/+9 |
* | | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -3/+3 |
* | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -14/+21 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| * | | | | | Automatic merge with 5.1 | Michael Widenius | 2010-10-06 | 1 | -1/+2 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Fixed bug #56862 (lp bug #640419). | Igor Babaev | 2010-09-19 | 1 | -1/+2 |
| * | | | | | Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable... | Michael Widenius | 2010-09-23 | 1 | -1/+0 |
| * | | | | | Merge | Igor Babaev | 2010-07-17 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixed bug #604503. | Igor Babaev | 2010-07-17 | 1 | -2/+2 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -5/+9 |
| |/ / / / | |||||
| * | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -12/+11 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -12/+11 |
| | |\ \ \ | | | |/ / | |||||
| * | | | | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| | * | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+3 |
| | |/ / / | |||||
| * | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -6/+6 |
| |/ / / | |||||
| * | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -1/+1 |
* | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -1/+1 |
* | | | | Bug #30584: delete with order by and limit clauses does not | Gleb Shchepa | 2010-06-23 | 1 | -4/+55 |
* | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+5 |
* | | | | WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch" | Guilhem Bichot | 2010-01-06 | 1 | -1/+2 |
* | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -3/+3 |
* | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -0/+2 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | A fix and a test case for | Konstantin Osipov | 2009-11-03 | 1 | -0/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | A fix and a test case for | Konstantin Osipov | 2009-11-03 | 1 | -0/+2 |
* | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -12/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | manual merge of 28141 | Tatiana A. Nurnberg | 2009-10-20 | 1 | -12/+9 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd... | Tatiana A. Nurnberg | 2009-10-19 | 1 | -12/+9 |
* | | | Backport of: | Konstantin Osipov | 2009-10-16 | 1 | -0/+5 |
|/ / | |||||
* | | Merge fix for BUG#35478 into 5.1 | Sergey Petrunia | 2008-07-15 | 1 | -2/+21 |
|\ \ | |/ | |||||
| * | BUG#35478: sort_union() returns bad data when sort_buffer_size is hit | Sergey Petrunia | 2008-07-15 | 1 | -3/+40 |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint | unknown | 2007-12-14 | 1 | -68/+61 |
|\ \ | |||||
| * | | Doxygenized comments. | unknown | 2007-10-11 | 1 | -68/+61 |