Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge MWL #247 from mariadb 5.3 -> mariadb 5.5. | Igor Babaev | 2012-03-02 | 1 | -2/+2 | |
|\ \ \ | ||||||
| * \ \ | Merge. | Igor Babaev | 2012-02-22 | 1 | -1/+6 | |
| |\ \ \ | | |/ / | ||||||
| * | | | Merged MWL#247 into the latest 5.3. | Igor Babaev | 2011-12-31 | 1 | -2/+2 | |
| |\ \ \ | ||||||
| | * | | | Implementation of the MWL#247: Make the optimizer use extended keys. | Igor Babaev | 2011-12-31 | 1 | -2/+2 | |
* | | | | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -1/+6 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | 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 | |
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -3/+4 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | 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 | |
| | | | | |\ | ||||||
| * | | | | | | BUG#901032: Wrong result for MIN/MAX on an indexed column with materializatio... | Sergey Petrunya | 2011-12-08 | 1 | -1/+2 | |
| |/ / / / / | ||||||
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -0/+4 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | 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 | |
* | | | | | | 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 | |
| | |\ \ \ \ |