summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / / / / /
* | | | | | 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
| |\ \ \ \ \ | | |/ / / /
| * | | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-091-0/+15
| * | | | | Backout the patch for bug#11758263.Rohit Kalhans2012-02-081-15/+0
| * | | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-081-0/+15
| * | | | | bug#13437900Andrei Elkin2011-12-141-1/+1
| * | | | | Bug#13437900 - VALGRIND REPORTS A LEAK FOR REPL_IGNORE_SERVER_IDSAndrei Elkin2011-12-141-0/+1
| * | | | | reverting the initial patch for bug#13437900 for refinement.Andrei Elkin2011-11-291-7/+0
| * | | | | Bug#13437900 - VALGRIND REPORTS A LEAK FOR REPL_IGNORE_SERVER_IDSAndrei Elkin2011-11-291-0/+7
* | | | | | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5.unknown2012-03-121-0/+16
|\ \ \ \ \ \
| * | | | | | Implementation of MDEV-28 LIMIT ROWS EXAMINEDunknown2012-03-111-0/+16
| | |_|/ / / | |/| | | |
* | | | | | 5.3 mergeSergei Golubchik2012-01-131-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Rewrite IGNORE handling:Michael Widenius2011-12-111-1/+0
| * | | | | Merge with 5.2.Michael Widenius2011-12-111-13/+32
| |\ \ \ \ \
| | * \ \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-13/+31
| | |\ \ \ \ \
| | | * \ \ \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-13/+31
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
* | | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix of LP BUG#872775.unknown2011-11-011-0/+7
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-0/+3
| * | | | | | BUG#849763: Wrong result with second execution of prepared statement with sem...Sergey Petrunya2011-09-201-1/+1
| * | | | | | Fixed LP bug #824463.Igor Babaev2011-08-151-1/+1
| | |_|_|_|/ | |/| | | |