Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -17/+60 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -8/+22 |
| |\ | |||||
| | * | MDEV-4029 SELECT on information_schema using a subquery locks up the informat... | Sergei Golubchik | 2013-01-20 | 1 | -6/+12 |
| | * | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -2/+10 |
| | |\ | |||||
| | | * | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH | Annamalai Gurusami | 2012-10-08 | 1 | -2/+10 |
| | | * | upmerge to bug#14548159 | Rohit Kalhans | 2012-09-22 | 1 | -1/+2 |
| | | |\ | |||||
| | | | * | BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIER | Rohit Kalhans | 2012-09-22 | 1 | -1/+2 |
| | | * | | merge 5.1 => 5.5 | Tor Didriksen | 2012-09-05 | 1 | -2/+3 |
| | | |\ \ | | | | |/ | |||||
| * | | | | cleanup: | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
| * | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -3/+3 |
| * | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -10/+39 |
* | | | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -5/+9 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 5.5-mwl248 -> 10.0-base | Igor Babaev | 2013-01-08 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge 5.5 -> mwl248 | Igor Babaev | 2013-01-08 | 1 | -3/+3 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | MDEV-3818: Query against view over IS tables worse than equivalent query with... | unknown | 2012-12-17 | 1 | -3/+3 |
| * | | | | | Merge mwl248->10.0-base. | Igor Babaev | 2012-12-19 | 1 | -2/+6 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge maria-5.5-mwl248 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -2/+6 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Addressed all remaining issues from the review of the patch | Igor Babaev | 2012-12-13 | 1 | -1/+2 |
| | | * | | | | Merge 5.5->mwl248 | Igor Babaev | 2012-12-04 | 1 | -2/+3 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | * | | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-11-02 | 1 | -2/+5 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge 5.5->5.5-mwl248. | Igor Babaev | 2012-08-29 | 1 | -10/+15 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge 5.5->5.5-mwl248 | Igor Babaev | 2012-08-14 | 1 | -2/+5 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-06-26 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge. | Igor Babaev | 2012-05-18 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Fixed the bug that caused displaying incorrect values in | Igor Babaev | 2012-05-17 | 1 | -2/+5 |
* | | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -28/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 1 | -9/+0 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -2/+281 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 1 | -2/+3 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -2/+3 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -2/+3 |
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|/ | | | | | | |/| | | | | | | |||||
| | | | | | * | | | | | | | Bug#13734987 MEMORY LEAK WITH I_S/SHOW AND VIEWS WITH SUBQUERY | Tor Didriksen | 2012-09-05 | 1 | -2/+3 |
| | | | | * | | | | | | | | Merge with latest 5.1. | unknown | 2012-08-24 | 1 | -10/+14 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | \ \ \ \ \ \ \ \ | Merge into latest 5.2. | unknown | 2012-08-24 | 1 | -10/+14 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -29/+35 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | |/| | | | | | | | | | |||||
| | | | | * | | | | | | | | | | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -29/+35 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / | | | | | | |/| | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -17/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -16/+45 |
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -0/+278 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-10-18 | 1 | -0/+278 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | / / / / / / / / / / / | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fix compiler warnings that breaks build (-Werror). | unknown | 2012-09-28 | 1 | -2/+1 |
| | * | | | | | | | | | | | | MDEV-495 backport --ignore-db-dir. | Alexey Botchkov | 2012-09-27 | 1 | -0/+281 |
* | | | | | | | | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -17/+229 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | SHOW EXPLAIN: merge to 10.0-base. | Sergey Petrunya | 2012-10-06 | 1 | -0/+188 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -0/+188 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | MWL#182: Explain running statements: Address feedback: | Sergey Petrunya | 2012-08-08 | 1 | -19/+2 |
| | | * | | | | | | | | | | | | Merge 5.5-main -> 5.5-show-explain | Sergey Petrunya | 2012-07-25 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | MDEV-408: SHOW EXPLAIN: Some values are chopped off in SHOW EXPLAIN output | Sergey Petrunya | 2012-07-24 | 1 | -3/+3 |
| | | * | | | | | | | | | | | | BUG#992942 & MDEV-325: Pre-liminary commit for testing | Sergey Petrunya | 2012-07-19 | 1 | -1/+1 |