summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | Fixed LP bug #872735.Igor Babaev2011-10-131-0/+15
| * | | | | | | mergeSergei Golubchik2011-10-111-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed that when using a trigger mysql.proc is now accessedMichael Widenius2011-10-061-1/+1
| * | | | | | | BUG#849763: Wrong result with second execution of prepared statement with sem...Sergey Petrunya2011-09-201-0/+41
| * | | | | | | Merge.Igor Babaev2011-09-081-15/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed LP bug #824463.Igor Babaev2011-08-151-15/+10
| * | | | | | | | Added MariaDB executable comment syntax: /*M!##### */Michael Widenius2011-08-291-17/+17
* | | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-4/+17
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | BUG#11758262 - 50439: MARK INSERT...SEL...ON DUP KEY UPD,REPLACE...SEL,CREATE...Rohit Kalhans2011-09-291-0/+6
| * | | | | | | | BUG#13001711Luis Soares2011-09-231-0/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | BUG#13001711: UNINITIALIZED VALUE IN MASTER_INFO::CLEAR_IN_MEMORY_INFO Luis Soares2011-09-201-0/+1
| * | | | | | | | Manual merge from mysql-5.5.Ramil Kalimullin2011-08-091-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-08-021-0/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-021-0/+1
| * | | | | | | | merge 5.1-security => 5.5-securityTor Didriksen2011-07-111-0/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Bug#11765255 - 58201: VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNC...Tor Didriksen2011-07-111-0/+3
| | |/ / / / /
| | * | | | | Merge from mysql-5.1.58-releaseKaren Langford2011-07-061-1/+4
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge from mysql-5.5.14-releaseunknown2011-07-061-1/+4
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ merge 5.1 => 5.5 : Bug#12329653Tor Didriksen2011-05-051-1/+4
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | merge 5.0 => 5.1 : Bug#12329653Tor Didriksen2011-05-041-1/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug#12329653 - EXPLAIN, UNION, PREPARED STATEMENT, CRASH, SQL_FULL_GROUP_BYTor Didriksen2011-05-041-1/+4
| * | | | | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Updated/added copyright headersKent Boortz2011-06-301-1/+1
| | | |/ / / / /
| | | * | | | | Postfix bug#49124Libing Song2011-01-261-1/+1
| | | * | | | | BUG#49124 Security issue with /*!-versioned */ SQL statements on Slaveunknown2011-01-151-3/+22
| | | * | | | | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-171-2/+1