summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-2/+3
|\
| * MDEV-26: Global transaction ID. First alpha release.unknown2013-04-151-2/+3
| |\
| | * MDEV-26: Global transaction ID.unknown2013-04-051-7/+3
| | * MDEV-26: Global Transaction ID.unknown2013-02-151-0/+2
| | * MDEV-26. Intermediate commit.unknown2013-01-221-0/+3
* | | 10.0-base mergeSergei Golubchik2013-04-151-1/+4
|\ \ \ | |/ /
| * | MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).Alexey Botchkov2013-04-131-1/+2
| |/
| * [NOT] EXISTS to IN transformation.unknown2013-02-261-0/+2
* | 10.0-base mergeSergei Golubchik2013-01-311-1/+1
|\ \ | |/
| * cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-1/+1
| * MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-1/+1
* | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-0/+3
|\ \ | |/
| * Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-0/+3
| |\
| | * Addressed the following issues from the review of the patch:Igor Babaev2012-12-051-0/+1
| | * Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-6/+8
| | |\
| | * \ MergeIgor Babaev2012-06-011-0/+6
| | |\ \
| | * | | Support of the extended syntax for ANALYZE.Igor Babaev2012-05-221-0/+2
* | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-3/+17
|\ \ \ \ \ | |/ / / /
| * | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-3/+16
| |\ \ \ \
| | * | | | MWL#182: Explain running statements: Address feedback:Sergey Petrunya2012-08-081-1/+0
| | * | | | Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-251-6/+8
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | MWL#182: Explain running statements: address review feedbackSergey Petrunya2012-07-101-1/+2
| | * | | | MWL#182: Explain running statementsSergey Petrunya2012-06-151-2/+15
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | MDEV-324: SHOW EXPLAIN: Plan produced by SHOW EXPLAIN for a query with TEMPTA...Sergey Petrunya2012-06-071-2/+4
| | | * | | Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5}Sergey Petrunya2012-05-171-2/+2
| | | |\ \ \
| | | | * | | # MDEV-239: Assertion `field_types == 0 ... ' failed in Protocol_text::store...Sergey Petrunya2012-05-101-2/+2
| | | | * | | MWL#182: Explain running statements: merge with 5.3-mainSergey Petrunya2012-04-131-2/+13
| | | | |\ \ \
| | | * | \ \ \ MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-2/+13
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | MWL#182: Explain running statements: merge with 5.3-main (needs fixing)Sergey Petrunya2012-01-031-2/+13
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| / / | | | | | |/ /
| | | | | * | MWL#182: Explain running statementsSergey Petrunya2011-10-271-1/+13
| | | | | |\ \
| | | | | | * | -Make show_explain.test stableSergey Petrunya2011-08-271-1/+7
| | | | | | * | MWL#182: Explain running statementsSergey Petrunya2011-08-231-0/+6
| * | | | | | | Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-10-041-1/+4
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-031-1/+2
| | * | | | | | Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-09-281-0/+1
| |/ / / / / /
* | | | | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-79/+7
|/ / / / / /
* | | | | | Merged the fix for bug lp:944706, mdev-193unknown2012-06-191-6/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge the fix for lp:944706, mdev-193unknown2012-06-061-6/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Patch for mdev-287: CHEAP SQ: A query with subquery in SELECT list, EXISTS, i...unknown2012-05-301-0/+1
| | * | | | | Fix for bug lp:944706, task MDEV-193unknown2012-05-171-6/+1
| | |/ / / /
* | | | | | mysql-5.5 mergeSergei Golubchik2012-06-141-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | merge bug11754117-45670 fixes from 5.1: fixing comments in sql_lex.h.Andrei Elkin2012-04-211-1/+2
| * | | | | merge bug11754117-45670 fixes from 5.1.Andrei Elkin2012-04-211-0/+5
| |\ \ \ \ \
| | * | | | | Backport 5.5=>5.1 Patch for Bug#13805127: Tor Didriksen2012-04-181-2/+14
* | | | | | | cSergei Golubchik2012-05-211-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | BUG#11765650 - 58637: MARK UPDATES THAT DEPEND ON ORDER OF TWO KEYS UNSAFERohit Kalhans2012-03-301-0/+6
* | | | | | mysql 5.5.23 mergeSergei Golubchik2012-04-101-2/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Patch for Bug#13805127: Stored program cache produces wrong result in same THD.Tor Didriksen2012-03-291-2/+14
* | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-2/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ \ \ \ | | |/ / / /