Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+1 |
|\ | |||||
| * | MDEV-4465: Reproducible crash (mysqld got signal 11) in multi_delete::initial... | Sergey Petrunya | 2013-05-03 | 1 | -1/+1 |
* | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+2 |
* | | Merge maria-5.5-mwl248 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -0/+2 |
|\ \ | |||||
| * | | Addressed all remaining issues from the review of the patch | Igor Babaev | 2012-12-13 | 1 | -0/+1 |
| * | | Merge 5.5->mwl248 | Igor Babaev | 2012-12-04 | 1 | -1/+3 |
| |\ \ | | |/ | |||||
| * | | Merge 5.5->5.5-mwl248 | Igor Babaev | 2012-08-14 | 1 | -1/+7 |
| |\ \ | |||||
| * \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-06-26 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-04-11 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| * | | | | | The pilot implementation of mwl#250: Use the statistics from persistent | Igor Babaev | 2012-04-11 | 1 | -0/+1 |
* | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -1/+3 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -1/+3 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Merge MariaDB 5.2->5.3 | unknown | 2012-11-20 | 1 | -1/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | Fixed bug mdev-3845. | Igor Babaev | 2012-11-09 | 1 | -1/+3 |
| | | * | | | | Fixed DELETE issues of view over view over table. | unknown | 2012-02-03 | 1 | -2/+3 |
* | | | | | | | Merge MDEV-415 -> 10.0-base. | Igor Babaev | 2012-09-01 | 1 | -3/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line. | Igor Babaev | 2012-09-01 | 1 | -3/+5 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -1/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Bug#13586591 RQG GRAMMAR CONF/ENGINES/ENGINE_STRESS.YY | Jon Olav Hauglid | 2012-06-12 | 1 | -1/+7 |
* | | | | | | Fix for bug lp:944706, task MDEV-193 | unknown | 2012-05-17 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge mariadb 5.3->mariadb 5.5 | unknown | 2012-03-24 | 1 | -1/+2 |
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | |||||
| * | | | Speedup: | Michael Widenius | 2012-03-23 | 1 | -1/+2 |
* | | | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -3/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view. | unknown | 2012-02-03 | 1 | -3/+4 |
| * | | | multi-delete should ignore semi-join internal temp tables, when looking for t... | Sergei Golubchik | 2012-01-18 | 1 | -1/+1 |
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -17/+9 |
|\ \ \ \ | |||||
| * | | | | multi-delete should ignore semi-join internal temp tables, | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Rewrite IGNORE handling: | Michael Widenius | 2011-12-11 | 1 | -15/+6 |
| * | | | 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 |
| | | |\ \ | |||||
* | | | \ \ | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -8/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -7/+7 |
* | | | | | | 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 | -20/+65 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Fixed LP bug #794901. | Igor Babaev | 2011-07-16 | 1 | -1/+3 |
| * | | | | | | Fixed LP bug #794890. | Igor Babaev | 2011-06-13 | 1 | -8/+15 |
| * | | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -15/+44 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fixed bugs causing failures fot the funcs_1 test suite. | Igor Babaev | 2011-06-03 | 1 | -4/+6 |
| | * | | | | | | Merge | Igor Babaev | 2011-05-20 | 1 | -15/+42 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -15/+42 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -15/+42 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -15/+42 |
| * | | | | | | | | | | Merge 5.3->main -> 5.3-mwl90 | Sergey Petrunya | 2011-05-29 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Merge MWL#90 with 5.3-main | Sergey Petrunya | 2011-05-25 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | MWL#90: Address review feedback part #14 | Sergey Petrunya | 2011-03-27 | 1 | -3/+4 |
| * | | | | | | | | | | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / |