summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2013-01-311-17/+60
|\
| * 5.5 mergeSergei Golubchik2013-01-291-8/+22
| |\
| | * MDEV-4029 SELECT on information_schema using a subquery locks up the informat...Sergei Golubchik2013-01-201-6/+12
| | * mysql-5.5.29 mergeSergei Golubchik2013-01-151-2/+10
| | |\
| | | * Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITHAnnamalai Gurusami2012-10-081-2/+10
| | | * upmerge to bug#14548159Rohit Kalhans2012-09-221-1/+2
| | | |\
| | | | * BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIERRohit Kalhans2012-09-221-1/+2
| | | * | merge 5.1 => 5.5Tor Didriksen2012-09-051-2/+3
| | | |\ \ | | | | |/
| * | | | cleanup:Sergei Golubchik2013-01-231-1/+1
| * | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-3/+3
| * | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-10/+39
* | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-5/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-3/+3
| |\ \ \ \
| | * \ \ \ Merge 5.5 -> mwl248Igor Babaev2013-01-081-3/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-3818: Query against view over IS tables worse than equivalent query with...unknown2012-12-171-3/+3
| * | | | | Merge mwl248->10.0-base.Igor Babaev2012-12-191-2/+6
| |\ \ \ \ \
| | * \ \ \ \ Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-2/+6
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Addressed all remaining issues from the review of the patchIgor Babaev2012-12-131-1/+2
| | | * | | | Merge 5.5->mwl248Igor Babaev2012-12-041-2/+3
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-2/+5
| | | |\ \ \ \
| | | | * \ \ \ Merge 5.5->5.5-mwl248.Igor Babaev2012-08-291-10/+15
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge 5.5->5.5-mwl248Igor Babaev2012-08-141-2/+5
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-1/+1
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge.Igor Babaev2012-05-181-0/+1
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Fixed the bug that caused displaying incorrect values inIgor Babaev2012-05-171-2/+5
* | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-28/+49
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-171-9/+0
| |/ / / / / / / / / /
| * | | | | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-2/+281
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | 5.3->5.5 mergeSergei Golubchik2012-11-221-2/+3
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-2/+3
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-2/+3
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-2/+3
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|/ | | | | | | |/| | | | | |
| | | | | | * | | | | | | Bug#13734987 MEMORY LEAK WITH I_S/SHOW AND VIEWS WITH SUBQUERYTor Didriksen2012-09-051-2/+3
| | | | | * | | | | | | | Merge with latest 5.1.unknown2012-08-241-10/+14
| | | | | |\ \ \ \ \ \ \ \
| | | | * | \ \ \ \ \ \ \ \ Merge into latest 5.2.unknown2012-08-241-10/+14
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ 5.1 mergeSergei Golubchik2012-08-221-29/+35
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-29/+35
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / | | | | | | |/| | | | | | | |
| * | | | | | | | | | | | | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-17/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-16/+45
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | merge with 5.5Sergei Golubchik2012-11-031-0/+278
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | 5.3 mergeSergei Golubchik2012-10-181-0/+278
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | / / / / / / / / / / / | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Fix compiler warnings that breaks build (-Werror).unknown2012-09-281-2/+1
| | * | | | | | | | | | | | MDEV-495 backport --ignore-db-dir.Alexey Botchkov2012-09-271-0/+281
* | | | | | | | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-17/+229
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-0/+188
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-0/+188
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | MWL#182: Explain running statements: Address feedback:Sergey Petrunya2012-08-081-19/+2
| | | * | | | | | | | | | | | Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-251-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | MDEV-408: SHOW EXPLAIN: Some values are chopped off in SHOW EXPLAIN outputSergey Petrunya2012-07-241-3/+3
| | | * | | | | | | | | | | | BUG#992942 & MDEV-325: Pre-liminary commit for testingSergey Petrunya2012-07-191-1/+1