Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+2 |
* | Merged the fix for bug mdev-4019. | Igor Babaev | 2013-01-13 | 1 | -0/+2 |
|\ | |||||
| * | Fixed bug mdev-4019. | Igor Babaev | 2013-01-13 | 1 | -0/+2 |
* | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -2/+6 |
|\ \ | |/ | |||||
| * | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -2/+6 |
| |\ | |||||
| | * | Merge MariaDB 5.2->5.3 | unknown | 2012-11-20 | 1 | -2/+6 |
| | |\ | |||||
| | | * | Fixed bug mdev-3845. | Igor Babaev | 2012-11-09 | 1 | -2/+6 |
| | | * | Fix check of view updatability in case of underlying view changes its updatab... | unknown | 2012-02-03 | 1 | -1/+2 |
| | | * | Fix gcc 4.6 warning after merge with 5.1 | unknown | 2011-10-27 | 1 | -2/+2 |
* | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-12-13 | 1 | -1/+1 |
* | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -27/+19 |
* | | | | Automatic merge | Michael Widenius | 2012-09-22 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.3 merge | Sergei Golubchik | 2012-08-31 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-492: fixed incorrect error check. | unknown | 2012-08-29 | 1 | -1/+1 |
* | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line. | Igor Babaev | 2012-09-01 | 1 | -2/+4 |
|/ / / | |||||
* | | | Fix for bug lp:944706, task MDEV-193 | unknown | 2012-05-17 | 1 | -1/+1 |
* | | | 5.3 merge | Sergei Golubchik | 2012-05-04 | 1 | -4/+0 |
|\ \ \ | |/ / | |||||
| * | | MDEV-216 lp:976104 - Assertion `0' failed in my_message_sql on UPDATE IGNORE,... | Sergei Golubchik | 2012-04-26 | 1 | -4/+0 |
* | | | Merge mariadb 5.3->mariadb 5.5 | unknown | 2012-03-24 | 1 | -2/+4 |
|\ \ \ | |/ / | |||||
| * | | Speedup: | Michael Widenius | 2012-03-23 | 1 | -2/+4 |
* | | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view. | unknown | 2012-02-03 | 1 | -2/+2 |
* | | | 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 | -8/+8 |
* | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ | |||||
| * \ \ | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -10/+20 |
| |\ \ \ | |||||
| * \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ | |||||
* | \ \ \ \ | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -63/+104 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Fixed LP bug #794901. | Igor Babaev | 2011-07-16 | 1 | -9/+6 |
| * | | | | | Merge with the latest 5.3 code. | Igor Babaev | 2011-07-11 | 1 | -2/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixed LP bug #794890. | Igor Babaev | 2011-06-13 | 1 | -2/+6 |
| * | | | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write | Michael Widenius | 2011-06-27 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Applied Sanja's patch to fix LP bug #784297 in the tree for mwl106. | Igor Babaev | 2011-05-27 | 1 | -2/+2 |
| * | | | | | Merge | Igor Babaev | 2011-05-20 | 1 | -31/+63 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -31/+63 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -31/+63 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -31/+63 |
| * | | | | | | | | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | MWL#89 | unknown | 2011-03-30 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge MWL#89 into 5.3 main. | unknown | 2011-01-11 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge 5.3-mwl89 into 5.3. | unknown | 2010-12-03 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformation | unknown | 2010-11-05 | 1 | -0/+4 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformation | unknown | 2010-09-05 | 1 | -0/+4 |
| | | | | | |/ / / / / / | |||||
| * | | | | | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge Mariadb 5.1->5.2 | unknown | 2011-04-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Bug fix for lp:732124 union + limit returns wrong result | Michael Widenius | 2011-03-09 | 1 | -1/+1 |
| * | | | | | | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 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 alias as String | Michael Widenius | 2011-02-28 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ |