Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -8/+19 |
|\ | |||||
| * | Automatic merge | Michael Widenius | 2012-08-13 | 1 | -2/+1 |
| |\ | |||||
| | * | Fixed compiler warnings (A few of these was bugs) | Michael Widenius | 2012-08-13 | 1 | -2/+1 |
| * | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -3/+4 |
| |\ \ | | |/ | |/| | |||||
| | * | Bug #13444084:PRIMARY KEY OR UNIQUE KEY >453 BYTES FAILS FOR | Chaithra Gopalareddy | 2012-07-11 | 1 | -3/+4 |
| * | | MDEV-376: Wrong result (missing rows) with index_merge+index_merge_intersecti... | Sergey Petrunya | 2012-07-04 | 1 | -3/+14 |
* | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -5/+5 |
|/ / | |||||
* | | merge with 5.3. | Sergei Golubchik | 2012-06-04 | 1 | -9/+49 |
|\ \ | |||||
| * \ | Merge | Sergey Petrunya | 2012-06-02 | 1 | -0/+17 |
| |\ \ | |||||
| | * | | BUG#1006164: Multi-table DELETE that uses innodb + index_merge/intersect may ... | Sergey Petrunya | 2012-06-02 | 1 | -0/+17 |
| * | | | Fixed a performance problem: calls of the function imerge_list_and_tree | Igor Babaev | 2012-05-25 | 1 | -9/+32 |
| |/ / | |||||
* | | | 5.3 merge | Sergei Golubchik | 2012-05-21 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge 5.2->5.3 | unknown | 2012-05-11 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix bug lp:993745 | unknown | 2012-05-03 | 1 | -1/+1 |
| | * | | Fixed LP bug #933117. | Igor Babaev | 2012-02-16 | 1 | -2/+7 |
* | | | | Merge mariadb 5.3->mariadb 5.5 | unknown | 2012-03-24 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed LP bug #954262. | Igor Babaev | 2012-03-20 | 1 | -1/+1 |
* | | | | Merge MWL #247 from mariadb 5.3 -> mariadb 5.5. | Igor Babaev | 2012-03-02 | 1 | -12/+23 |
|\ \ \ \ | |||||
| * | | | | Addressed all review feedbacks for mwl #247. | Igor Babaev | 2012-02-28 | 1 | -6/+7 |
| * | | | | Merge. | Igor Babaev | 2012-02-22 | 1 | -3/+13 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Merged MWL#247 into the latest 5.3. | Igor Babaev | 2011-12-31 | 1 | -14/+24 |
| |\ \ \ \ | |||||
| | * | | | | Implementation of the MWL#247: Make the optimizer use extended keys. | Igor Babaev | 2011-12-31 | 1 | -14/+24 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-02-21 | 1 | -3/+13 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Fixed LP bug #928352. | Igor Babaev | 2012-02-16 | 1 | -3/+13 |
| |/ / / / | |||||
* | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -0/+12 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Bug#12540545 61101: ASSERTION FAILURE IN THREAD 1256741184 IN FILE /BUILDDIR/... | Sergey Glukhov | 2011-10-19 | 1 | -0/+12 |
* | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+4 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 1 | -0/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Fixed bug lp:900375 | unknown | 2011-12-12 | 1 | -0/+2 |
| | * | | | Fixed bug lp:888456 | unknown | 2011-12-08 | 1 | -0/+1 |
| * | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -1/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -1/+2 |
| | |\ \ \ | |||||
| | | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -1/+2 |
| | | |\ \ \ | |||||
| | | | * \ \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -2/+2 |
| | | | |\ \ \ | |||||
* | | | | \ \ \ | 5.3->5.5 merge | Sergei Golubchik | 2011-11-27 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Fixed LP bug #891953. | Igor Babaev | 2011-11-18 | 1 | -1/+1 |
| * | | | | | | | Fixed LP bug #800184. | Igor Babaev | 2011-11-18 | 1 | -2/+2 |
* | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -12/+16 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge. | Igor Babaev | 2011-11-12 | 1 | -12/+16 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Fixed LP bug #823301. | Igor Babaev | 2011-11-12 | 1 | -12/+16 |
* | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
* | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -710/+3177 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | field_conv.cc: added comments | Sergey Petrunya | 2011-08-17 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Backport of: | Sergey Petrunya | 2011-08-05 | 1 | -3/+54 |
| * | | | | | | Backport of: | Sergey Petrunya | 2011-08-04 | 1 | -160/+407 |
| * | | | | | | Fixed LP BUG#800696. | unknown | 2011-07-19 | 1 | -4/+6 |
| * | | | | | | Fix LP bug lp:802979 | unknown | 2011-07-04 | 1 | -1/+4 |
| * | | | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write | Michael Widenius | 2011-06-27 | 1 | -2/+2 |
| * | | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -3/+8 |
| |\ \ \ \ \ \ |