summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base -> 10.0-montySergei Golubchik2012-10-191-4/+126
|\
| * SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-3/+125
| |\
| | * SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-3/+125
| | |\
| | | * Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-251-3/+87
| | | |\
| | | * | MDEV-298: SHOW EXPLAIN: Plan returned by SHOW EXPLAIN only contains 'Using te...Sergey Petrunya2012-07-201-1/+2
| | | * | Better comments.Sergey Petrunya2012-07-061-1/+3
| | | * | MWL#182: Explain running statementsSergey Petrunya2012-06-151-3/+122
| | | |\ \
| | | | * | MDEV-323: SHOW EXPLAIN: Plan produced by SHOW EXPLAIN loses 'UNION RESULT' lineSergey Petrunya2012-06-071-4/+2
| | | | * | MDEV-324: SHOW EXPLAIN: Plan produced by SHOW EXPLAIN for a query with TEMPTA...Sergey Petrunya2012-06-071-7/+15
| | | | * | Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5}Sergey Petrunya2012-05-171-10/+37
| | | | |\ \
| | | | | * | MDEV-273: SHOW EXPLAIN: server crashes in JOIN::print_explain on a query with...Sergey Petrunya2012-05-161-1/+5
| | | | | * | MDEV-270: SHOW EXPLAIN: server crashes in JOIN::print_explain on a query with Sergey Petrunya2012-05-151-1/+1
| | | | | * | MDEV-267: SHOW EXPLAIN: Server crashes in JOIN::print_explain on most of queriesSergey Petrunya2012-05-141-5/+16
| | | | | * | MDEV-240: SHOW EXPLAIN: Assertion `this->optimized == 2' failedSergey Petrunya2012-05-111-1/+1
| | | | | * | # MDEV-239: Assertion `field_types == 0 ... ' failed in Protocol_text::store...Sergey Petrunya2012-05-101-7/+9
| | | | | * | MWL#182: Explain running statements:Sergey Petrunya2012-05-101-3/+3
| | | | | * | MWL#182: Explain running statementsSergey Petrunya2012-04-261-0/+9
| | | | | * | MWL#182: Explain running statements: merge with 5.3-mainSergey Petrunya2012-04-131-4/+79
| | | | | |\ \
| | | | * | \ \ MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-3/+89
| | | | |\ \ \ \
| | | | | * | | | Apply earlier patch: correct handling of subqueries that Sergey Petrunya2012-01-041-14/+26
| | | | | * | | | MWL#182: Explain running statements: merge with 5.3-main (needs fixing)Sergey Petrunya2012-01-031-5/+79
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| |
| | | | | | * | | MWL#182: Explain running statementsSergey Petrunya2011-10-281-0/+17
| | | | | | * | | MWL#182: Explain running statementsSergey Petrunya2011-10-271-5/+62
| | | | | | |\ \ \
| | | | | | | * | | Fix typo bug in UNION handling, add tests for SHOW EXPLAIN for UNION.Sergey Petrunya2011-10-271-1/+5
| | | | | | | * | | Fix SHOW EXPLAIN for UNIONs.Sergey Petrunya2011-10-271-0/+5
| | | | | | | * | | - Testing: add DBUG_EXECUTE_IF("show_explain_probe_2"... which fires Sergey Petrunya2011-09-251-1/+2
| | | | | | | * | | -Make show_explain.test stableSergey Petrunya2011-08-271-3/+11
| | | | | | | * | | Fix for previous csets: let set_explain_type() produce correct types for "UNI...Sergey Petrunya2011-08-261-1/+1
| | | | | | | * | | MWL#182: Explain running statementsSergey Petrunya2011-08-241-8/+13
| | | | | | | * | | MWL#182: Explain running statementsSergey Petrunya2011-08-231-0/+34
| * | | | | | | | | Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-09-281-0/+1
| * | | | | | | | | Automatic merge with 5.5Michael Widenius2012-09-011-1/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | 5.3 mergeSergei Golubchik2012-08-271-1/+0
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | 5.2 merge.Sergei Golubchik2012-08-221-0/+23
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ 5.1 mergeSergei Golubchik2012-08-221-0/+22
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ merge with MySQL 5.1.65Sergei Golubchik2012-08-221-0/+22
| | | | | |\ \ \ \ \ \ \
* | | | | | | | | | | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-0/+7
|/ / / / / / / / / / / /
* | | | | | | | | | | | automatic merge with 5.5Michael Widenius2012-06-271-3/+87
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merged the fix for bug lp:944706, mdev-193unknown2012-06-191-2/+85
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge the fix for lp:944706, mdev-193unknown2012-06-061-2/+85
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Patch for mdev-287: CHEAP SQ: A query with subquery in SELECT list, EXISTS, i...unknown2012-05-301-0/+61
| | | * | | | | | | | | | Fix for bug lp:944706, task MDEV-193unknown2012-05-171-2/+24
| | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | mysql-5.5 mergeSergei Golubchik2012-06-141-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | merge bug11754117-45670 fixes from 5.1.Andrei Elkin2012-04-211-1/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Backport 5.5=>5.1 Patch for Bug#13805127: Tor Didriksen2012-04-181-0/+22
* | | | | | | | | | | | Fixed commentMichael Widenius2012-06-041-4/+5
* | | | | | | | | | | | Increased the version number to 10.0Michael Widenius2012-05-311-2/+9
|/ / / / / / / / / / /
* | | | | | | | | | | cSergei Golubchik2012-05-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | BUG#11765650 - 58637: MARK UPDATES THAT DEPEND ON ORDER OF TWO KEYS UNSAFERohit Kalhans2012-03-301-1/+2
* | | | | | | | | | 5.3 mergeSergei Golubchik2012-05-041-0/+15
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |