Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+2 |
|\ | |||||
| * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| |\ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -23/+36 |
|\ \ \ \ | |||||
| * | | | | Fixed LP bug #702301. | Igor Babaev | 2011-07-20 | 1 | -1/+1 |
| * | | | | Fixed LP bug #802023. | Igor Babaev | 2011-06-25 | 1 | -6/+6 |
| * | | | | Fixed LP bug #800518. | Igor Babaev | 2011-06-23 | 1 | -3/+5 |
| * | | | | Merge | Igor Babaev | 2011-05-20 | 1 | -5/+17 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -5/+17 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -5/+17 |
| | | |\ \ \ \ | |||||
| | | | * | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -5/+17 |
| * | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -12/+30 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -12/+30 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -12/+30 |
| | | |\ \ \ \ \ \ | |||||
| * | | \ \ \ \ \ \ | Merge | Igor Babaev | 2011-04-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Fixed LP bugs #717577, #724942. | Igor Babaev | 2011-04-26 | 1 | -1/+1 |
| * | | | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / | |||||
| | * | | | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||||
* | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -13/+32 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Merge fix for Bug#11765713 from 5.1 | Tor Didriksen | 2011-04-15 | 1 | -12/+31 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | Bug#11765713 58705: OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES CREAT... | Tor Didriksen | 2011-04-14 | 1 | -12/+31 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Bug #57954: BIT_AND function returns incorrect results | Georgi Kodinov | 2010-12-08 | 1 | -1/+1 |
* | | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -34/+29 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -175/+163 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| / / / | | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -175/+164 |
| | |\ \ \ \ | | | |/ / / | |||||
| * | | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -45/+68 |
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | |||||
| | * | | | Fixes after last merge of MySQL 5.1 | Michael Widenius | 2010-05-13 | 1 | -3/+3 |
| | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -45/+68 |
| | |\ \ \ | |||||
| * | \ \ \ | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -1/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+2 |
| | |\ \ \ \ | |||||
| * | | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -19/+19 |
| |/ / / / / | |||||
| * | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -2/+2 |
| * | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -7/+3 |
* | | | | | | | Merge of fix for bug#53859. | Martin Hansson | 2010-06-11 | 1 | -13/+28 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Bug#53859: Valgrind: opt_sum_query(TABLE_LIST*, List<Item>&, | Martin Hansson | 2010-06-11 | 1 | -13/+28 |
* | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-24 | 1 | -162/+136 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fix for bug#52051: Aggregate functions incorrectly returns | Ramil Kalimullin | 2010-05-12 | 1 | -162/+136 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+2 |
* | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -4/+2 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -14/+3 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Backport of Bug#15192 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -4/+2 |
* | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-03-20 | 1 | -31/+65 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Bug#47762: Incorrect result from MIN() when WHERE tests NOT | Martin Hansson | 2010-03-16 | 1 | -31/+65 |
* | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-22 | 1 | -14/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | |||||
| * | | | | | BUG#49902 - SELECT returns incorrect results | Sergey Vojtovich | 2010-02-09 | 1 | -14/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Bug#48060 Memory leak - Item::val_bool() (item.cc:184) from optimizer_subquer... | Tor Didriksen | 2009-10-28 | 1 | -6/+6 |
* | | | | | Merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-19 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Bug#47280 - strange results from count(*) with order by multiple | Jorgen Loland | 2009-10-14 | 1 | -1/+2 |