Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -5/+6 |
|\ | |||||
| * | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -2/+2 |
| * | Push a lot of small fixes to get larger parts to compile | Michael Widenius | 2013-05-21 | 1 | -3/+4 |
* | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -35/+513 |
|\ \ | |/ |/| | |||||
| * | handlerton::discover_table_names() can not discover only | Sergei Golubchik | 2013-04-09 | 1 | -1/+1 |
| * | Merge 5.5->10.0-base | Igor Babaev | 2013-03-31 | 1 | -2/+13 |
| |\ | |||||
| | * | Fix for MDEV-4144 | unknown | 2013-03-29 | 1 | -2/+13 |
| * | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -3/+10 |
| |\ \ | | |/ | |||||
| | * | MDEV-4284 Assertion `cmp_items[(uint)cmp_type]' fails in sql/item_cmpfunc.cc | Sergei Golubchik | 2013-03-17 | 1 | -2/+8 |
| | * | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Bug#15972635: Incorrect results returned in 32 table join with HAVING | Roy Lyseng | 2012-12-21 | 1 | -1/+2 |
| * | | | [NOT] EXISTS to IN transformation. | unknown | 2013-02-26 | 1 | -30/+490 |
* | | | | Automatic merge | Michael Widenius | 2013-02-15 | 1 | -5/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-537 Make multi-column non-top level subqueries to be executed via index ... | unknown | 2013-02-07 | 1 | -5/+6 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -11/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -9/+22 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -9/+22 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH | Annamalai Gurusami | 2012-10-08 | 1 | -9/+22 |
| * | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -2/+2 |
| * | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -13/+14 |
| |\ \ \ | | |/ / | |||||
* | | | | MDEV-3858 Change JOIN_TAB::records_read from ha_rows to double | unknown | 2012-11-15 | 1 | -1/+1 |
* | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -13/+14 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | MDEV-3812 | unknown | 2012-10-27 | 1 | -2/+2 |
| * | | MDEV-3812: Remove unneeded extra call to engine->exec() in Item_subselect::ex... | unknown | 2012-10-25 | 1 | -10/+13 |
| * | | 5.3 merge | Sergei Golubchik | 2012-10-18 | 1 | -4/+2 |
| |\ \ | |||||
| | * | | MDEV-521 fix. | unknown | 2012-09-20 | 1 | -4/+2 |
| * | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | 5.1 -> 5.5 merge | Sergey Glukhov | 2012-08-09 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Bug #14409015 MEMORY LEAK WHEN REFERENCING OUTER FIELD IN HAVING | Sergey Glukhov | 2012-08-09 | 1 | -1/+1 |
* | | | | | SHOW EXPLAIN: merge to 10.0-base. | Sergey Petrunya | 2012-10-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | SHOW EXPLAIN: merge with mariadb 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge 5.5-main -> 5.5-show-explain | Sergey Petrunya | 2012-07-25 | 1 | -3/+81 |
| | | |\ \ \ \ | |||||
| | | * | | | | | MDEV-327: SHOW EXPLAIN: Different select_type in plans produced by SHOW EXPLA... | Sergey Petrunya | 2012-06-19 | 1 | -1/+1 |
* | | | | | | | | Automatic merge with 5.5 | Michael Widenius | 2012-10-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Fixed issues found by buildbot & valgrind: | Michael Widenius | 2012-10-04 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Automatic merge | Michael Widenius | 2012-09-22 | 1 | -200/+107 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merged the fix for bug lp:1009187, mdev-373 | unknown | 2012-09-18 | 1 | -200/+105 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | - Merged the fix for bug lp:1009187, mdev-373. | unknown | 2012-09-17 | 1 | -200/+105 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix bug lp:1009187, mdev-373, mysql bug#58628 | unknown | 2012-09-14 | 1 | -85/+54 |
| * | | | | | | | Added new status variables: | Michael Widenius | 2012-09-09 | 1 | -0/+2 |
* | | | | | | | | Automatic merge with 5.5 | Michael Widenius | 2012-09-01 | 1 | -9/+48 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | 5.3 merge | Sergei Golubchik | 2012-08-27 | 1 | -2/+26 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | fix for MDEV-367 | unknown | 2012-08-25 | 1 | -1/+25 |
| | * | | | | | | MDEV-472 mysql-test-run --valgrind main.ps_2myisam gives warning about not in... | Sergei Golubchik | 2012-08-22 | 1 | -1/+1 |
| * | | | | | | | Fixed compiler warnings | Michael Widenius | 2012-08-15 | 1 | -0/+6 |
| * | | | | | | | Fixed compiler errors | Michael Widenius | 2012-08-14 | 1 | -6/+15 |
| | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | MDEV-410: EXPLAIN shows type=range, while SHOW EXPLAIN and userstat show full... | Sergey Petrunya | 2012-07-25 | 1 | -1/+1 |
* | | | | | | | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 1 | -2/+80 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merged the fix for bug lp:944706, mdev-193 | unknown | 2012-06-19 | 1 | -0/+42 |
| |\ \ \ \ \ \ |