summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* MDEV-4902 - sql_yacc.yy incompatible with bison 3Sergey Vojtovich2013-08-301-1/+1
* mysql-5.5.32 mergeSergei Golubchik2013-07-161-2/+5
|\
| * Merge from 5.1 to 5.5Chaithra Gopalareddy2013-04-141-2/+4
| |\
| | * Bug#16347426:ASSERTION FAILED: (SELECT_INSERT &&Chaithra Gopalareddy2013-04-141-2/+3
| | * Updated/added copyright headers.Murthy Narkedimilli2013-02-251-1/+1
| * | Bug#16359402 CRASH WITH AGGREGATES: ASSERTION FAILED: N < M_SIZETor Didriksen2013-03-141-1/+2
* | | 5.3 merge.Sergei Golubchik2013-05-201-0/+3
|\ \ \
| * | | MDEV-4290:unknown2013-05-031-0/+3
| * | | 5.2 -> 5.3Sergei Golubchik2013-02-281-1/+5
| |\ \ \
| | * \ \ 5.1 -> 5.2 mergeSergei Golubchik2013-02-281-1/+5
| | |\ \ \
| | | * \ \ mysql-5.1 mergeSergei Golubchik2013-02-281-1/+5
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Applying patch for Bug#67177 Bug#15967374 from KentHery Ramilison2013-01-081-1/+5
| * | | | | 5.2 merge.Sergei Golubchik2012-08-221-2/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.1 mergeSergei Golubchik2012-08-221-2/+14
| | |\ \ \ \ | | | |/ / /
| | | * | | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-2/+14
| | | |\ \ \ | | | | |/ /
* | | | | | 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
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-13/+76
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | BUG#11758262 - 50439: MARK INSERT...SEL...ON DUP KEY UPD,REPLACE...SEL,CREATE...Rohit Kalhans2011-09-291-0/+42