summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\
* | | | \ 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
* | | | | | | 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
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix bug lp:985667, MDEV-229unknown2012-04-271-0/+15
* | | | | | mysql 5.5.23 mergeSergei Golubchik2012-04-101-0/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Patch for Bug#13805127: Stored program cache produces wrong result in same THD.Tor Didriksen2012-03-291-0/+23
* | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-2/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-091-0/+2
| * | | | | Backout the patch for bug#11758263.Rohit Kalhans2012-02-081-2/+0
| * | | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-081-0/+2
* | | | | | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5.unknown2012-03-121-1/+4
|\ \ \ \ \ \
| * | | | | | Implementation of MDEV-28 LIMIT ROWS EXAMINEDunknown2012-03-111-0/+2
| | |_|/ / / | |/| | | |
* | | | | | 5.3.4 mergeSergei Golubchik2012-02-151-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix for LP BUG#910123 MariaDB 5.3.3 causes 1093 error on Drupalunknown2012-02-141-0/+1
* | | | | | Fix set_limit to be uniform with all calls.unknown2012-02-101-1/+1
* | | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-2/+57
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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-1/+0
| * | | | | Bug#13437900 - VALGRIND REPORTS A LEAK FOR REPL_IGNORE_SERVER_IDSAndrei Elkin2011-11-291-0/+1
| * | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-10-121-0/+7
| |\ \ \ \ \
| * | | | | | Fixed Bug#12621017 - CRASH IF A SP VARIABLE IS USED IN THE LIMIT CLAUSE OF ADmitry Shulga2011-08-131-2/+57
* | | | | | | 5.3 mergeSergei Golubchik2012-01-131-22/+61
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge with 5.1 & fixes to IGNORE handlingMichael Widenius2011-12-111-4/+13
| |\ \ \ \ \ \
| | * | | | | | Rewrite IGNORE handling:Michael Widenius2011-12-111-1/+1
| | * | | | | | Merge with 5.2.Michael Widenius2011-12-111-3/+12
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-3/+12
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-0/+3
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | Manual merge from mysql-5.1.Ramil Kalimullin2011-08-091-0/+1
| | | | | |\ \ \
| | | | * | \ \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-3/+9
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| * | | | | | | | Merge fix for BUG#868908Sergey Petrunya2011-12-081-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | BUG#868908: Crash in check_simple_equality() with semijoin + materialization ...Sergey Petrunya2011-12-071-3/+3
| | |/ / / / / / /
| * | | | | | | | Make subquery Materialization, as well as semi-join Materialization be shownSergey Petrunya2011-12-051-13/+51
| |/ / / / / / /
* | | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-35/+96
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix MySQL BUG#12329653unknown2011-11-121-2/+2
| * | | | | | | Merge of LP BUG#872775 fixunknown2011-11-021-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix of LP BUG#872775.unknown2011-11-011-0/+1
| * | | | | | | | Fixed LP bug #881449.Igor Babaev2011-10-261-3/+9
| |/ / / / / / /
| * | | | | | | Fixed LP bug #874378.Igor Babaev2011-10-221-1/+4