Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge 5.2->5.3 | unknown | 2012-03-14 | 1 | -2/+8 | |
|\ | ||||||
| * | Fixed LP bug #884175. | Igor Babaev | 2012-03-08 | 1 | -2/+8 | |
* | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. | Igor Babaev | 2012-02-01 | 1 | -1/+6 | |
|\ \ | |/ | ||||||
| * | Fixed LP bug #879860. | Igor Babaev | 2011-12-27 | 1 | -0/+4 | |
| * | Fixed LP bug #904345. | Igor Babaev | 2011-12-27 | 1 | -1/+2 | |
* | | Merge with 5.1 & fixes to IGNORE handling | Michael Widenius | 2011-12-11 | 1 | -2/+4 | |
|\ \ | ||||||
| * \ | 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 | |
| | | |\ | ||||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -13/+32 | |
| | | | |\ | ||||||
| | | | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 | |
| | | | |\ \ | ||||||
| | | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 | |
* | | | | | | | BUG#901032: Wrong result for MIN/MAX on an indexed column with materializatio... | Sergey Petrunya | 2011-12-08 | 1 | -1/+2 | |
|/ / / / / / | ||||||
* | | | | | | Fix bug lp:858148. | unknown | 2011-09-28 | 1 | -0/+2 | |
* | | | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -0/+2 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | LP BUG#813418 fix. | unknown | 2011-09-08 | 1 | -0/+2 | |
* | | | | | | 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 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | * | | | | | Bug#11765713 58705: OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES CREAT... | Tor Didriksen | 2011-04-14 | 1 | -12/+31 | |
| | | | |_|/ / | | | |/| | | | ||||||
* | | | | | | | 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 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
* | | | | | | 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 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Bug#53859: Valgrind: opt_sum_query(TABLE_LIST*, List<Item>&, | Martin Hansson | 2010-06-11 | 1 | -13/+28 | |
| | * | | | Fix for bug#52051: Aggregate functions incorrectly returns | Ramil Kalimullin | 2010-05-12 | 1 | -162/+136 | |
* | | | | | 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 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Bug#47762: Incorrect result from MIN() when WHERE tests NOT | Martin Hansson | 2010-03-16 | 1 | -31/+65 | |
| | * | | BUG#49902 - SELECT returns incorrect results | Sergey Vojtovich | 2010-02-09 | 1 | -14/+3 | |
* | | | | 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 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Bug#47280 - strange results from count(*) with order by multiple | Jorgen Loland | 2009-10-14 | 1 | -1/+2 | |
| | | | | ||||||
| | | \ | ||||||
| | *-. \ | 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 | -2/+2 | |
| | | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-09 | 1 | -2/+2 | |
| | | |/ | ||||||
| | | * | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -3/+3 | |
| | | * | backported the fix for bug #34773 to 5.0 | Georgi Kodinov | 2008-12-09 | 1 | -3/+3 | |
* | | | | 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 |