Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -4/+25 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -2/+18 |
| |\ | |||||
| | * | 5.3 merge | Sergei Golubchik | 2013-01-25 | 1 | -0/+1 |
| | |\ | |||||
| | | * | 5.2 merge | Sergei Golubchik | 2013-01-25 | 1 | -0/+1 |
| | | |\ | |||||
| | | | * | MDEV-3915 COM_CHANGE_USER allows fast password brute-forcing | Sergei Golubchik | 2013-01-25 | 1 | -0/+1 |
| | * | | | Merge 5.3->5.5 | Igor Babaev | 2013-01-23 | 1 | -1/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge 5.2->5.3 | Igor Babaev | 2013-01-21 | 1 | -1/+3 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Merge 5.1->5.2 | Igor Babaev | 2013-01-21 | 1 | -1/+3 |
| | | | |\ | |||||
| | | | | * | Fixed bug mdev-4063 (bug #56927). | Igor Babaev | 2013-01-21 | 1 | -1/+3 |
| | | * | | | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -4/+17 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -4/+17 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -4/+17 |
| | | | | |\ | |||||
| | | | | | * | Solve a linkage problem with "libmysqld" on several Solaris platforms: | Kent Boortz | 2012-06-26 | 1 | -2/+1 |
| | | | | | * | Bug#12636001 : deadlock from thd_security_context | Gopal Shankar | 2012-05-17 | 1 | -2/+14 |
| | * | | | | | simplify THD::binlog_setup_trx_data() usage | Sergei Golubchik | 2013-01-18 | 1 | -1/+1 |
| | * | | | | | remove thd_mark_as_hard_kill() | Sergei Golubchik | 2013-01-15 | 1 | -11/+0 |
| | * | | | | | Fixed some race conditons and bugs related to killed queries | Michael Widenius | 2013-01-11 | 1 | -0/+24 |
| * | | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -2/+2 |
| * | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -2/+7 |
* | | | | | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge maria-5.5-mwl248 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-11-02 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | | * | | | | | Merge 5.5->5.5-mwl248. | Igor Babaev | 2012-08-29 | 1 | -0/+2 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge 5.5->5.5-mwl248 | Igor Babaev | 2012-08-14 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-06-26 | 1 | -3/+7 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Removed the server option --stat-tables. | Igor Babaev | 2012-06-02 | 1 | -1/+1 |
| | | * | | | | | | | | Merge | Igor Babaev | 2012-06-01 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merged 5.3 changes into the mwl #248 tree. | Igor Babaev | 2012-03-09 | 1 | -3/+18 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | The main patch for the MWL#248 back-ported from | Igor Babaev | 2012-01-04 | 1 | -0/+1 |
* | | | | | | | | | | | | | | After-merge fixes for merge 10.0-base -> 10.0. | unknown | 2012-12-18 | 1 | -2/+2 |
* | | | | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -1/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | MDEV-532: Async InnoDB commit checkpoint. | unknown | 2012-12-14 | 1 | -1/+2 |
| * | | | | | | | | | | | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -0/+10 |
* | | | | | | | | | | | | | | | small code cleanup taken from MySQL 5.6 | Sergei Golubchik | 2012-12-16 | 1 | -2/+7 |
* | | | | | | | | | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -29/+164 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | SHOW EXPLAIN: merge to 10.0-base. | Sergey Petrunya | 2012-10-06 | 1 | -9/+90 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -9/+90 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | MWL#182: Explain running statements: merge with 5.5-main | Sergey Petrunya | 2012-08-12 | 1 | -9/+90 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | Merge 5.5-main -> 5.5-show-explain | Sergey Petrunya | 2012-07-25 | 1 | -3/+7 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / / | | | | | |/| | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | MWL#182: Explain running statements | Sergey Petrunya | 2012-07-17 | 1 | -33/+3 |
| | | | * | | | | | | | | | | | | MWL#182: Explain running statements: address review feedback | Sergey Petrunya | 2012-07-11 | 1 | -1/+8 |
| | | | * | | | | | | | | | | | | MWL#182: Explain running statements: address review feedback | Sergey Petrunya | 2012-07-10 | 1 | -14/+9 |
| | | | * | | | | | | | | | | | | MWL#182: Explain running statements: address review feedback | Sergey Petrunya | 2012-06-29 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | MWL#182: Explain running statements: address review feedback | Sergey Petrunya | 2012-06-28 | 1 | -4/+5 |
| | | | * | | | | | | | | | | | | SHOW EXPLAIN: better comments | Sergey Petrunya | 2012-06-19 | 1 | -8/+21 |
| | | | * | | | | | | | | | | | | MWL#182: Explain running statements | Sergey Petrunya | 2012-06-15 | 1 | -9/+104 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | MDEV-324: SHOW EXPLAIN: Plan produced by SHOW EXPLAIN for a query with TEMPTA... | Sergey Petrunya | 2012-06-07 | 1 | -0/+2 |
| | | | | * | | | | | | | | | | | Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5} | Sergey Petrunya | 2012-05-17 | 1 | -0/+4 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ |