summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
Commit message (Expand)AuthorAgeFilesLines
* merge with mysql-5.5.21Sergei Golubchik2012-03-091-0/+2
|\
| * Fixed bug#11753187 (formerly known as bug 44585): SP_CACHE BEHAVES ASDmitry Shulga2012-01-251-0/+2
* | mdev-20: INSTALL PLUGIN SONAMESergei Golubchik2012-03-051-1/+2
* | Update copyright noticesVladislav Vaintroub2012-02-281-1/+1
* | merge from 5.5Vladislav Vaintroub2012-02-161-3/+13
|\ \
| * \ Merge fix for lp:910817: Race condition in kill_threads_for_user().unknown2012-02-101-3/+13
| |\ \
| | * | lp:910817: Race condition in kill_threads_for_user()unknown2012-02-101-3/+13
* | | | small cleanupsVladislav Vaintroub2012-01-241-1/+0
* | | | mergeVladislav Vaintroub2012-01-241-6/+36
|\ \ \ \ | |/ / /
| * | | mysql-5.5 mergeSergei Golubchik2012-01-161-1/+3
| |\ \ \ | | | |/ | | |/|
| | * | Merge from mysql-5.5.18-releaseunknown2011-11-171-2/+29
| | |\ \
| | | * \ Bug12589870 post merge fixes - manual mergeTatjana Azundris Nuernberg2011-10-191-2/+4
| | | |\ \
| | | * \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-10-121-0/+46
| | | |\ \ \
| | | * \ \ \ Merge from 5.1-securityMagne Mahre2011-10-071-2/+19
| | | |\ \ \ \
| | | * \ \ \ \ Manual merge from mysql-5.1-security.Alexander Nozdrin2011-09-231-0/+8
| | | |\ \ \ \ \
| | * | | | | | | Bug#11763573 - 56299: MUTEX DEADLOCK WITH COM_BINLOG_DUMP, BINLOG PURGE, AND ...Andrei Elkin2011-10-271-1/+1
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | 5.3 mergeSergei Golubchik2012-01-131-5/+33
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Fixed valgrind error when storing db_name_length in query_cache.Michael Widenius2011-12-131-5/+5
| | * | | | | | Merge with 5.2.Michael Widenius2011-12-111-27/+93
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-27/+93
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge with MySQL 5.1.60Michael Widenius2011-11-231-7/+60
| | | | |\ \ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | |
| | | | | * | | | | Bug12589870 post-merge fixes for Sparc64 and friendsTatjana Azundris Nuernberg2011-10-191-2/+4
| | | | | * | | | | auto-merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-10-121-0/+6
| | | | | |\ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | |
| | | | | * | | | | BUG#12589870 CRASHES WITH MULTIQUERY PACKET + USE<DB> + QUERY CACHEMagne Mahre2011-10-071-2/+19
| | | | | | |_|_|/ | | | | | |/| | |
| | | | | * | | | Fix for Bug#13001491: MYSQL_REFRESH CRASHES WHEN STORED ROUTINES ARE RUN CONC...Alexander Nozdrin2011-09-221-5/+39
| | | | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-9/+22
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
* | | | | | | | | merge 5.5Vladislav Vaintroub2012-01-111-1/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | moved ha_maria::implicit_commit() calls aroundSergei Golubchik2012-01-061-1/+8
* | | | | | | | | Small adjustements to threadpoolVladislav Vaintroub2011-12-181-1/+1
* | | | | | | | | Initial threadpool implementation for MariaDB 5.5Vladislav Vaintroub2011-12-081-1/+4
|/ / / / / / / /
* | | | | | | | small cleanupSergei Golubchik2011-11-281-8/+1
* | | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-23/+136
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix of LP BUG#872775.unknown2011-11-011-0/+1
| * | | | | | | mergeSergei Golubchik2011-10-111-8/+10
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed that when using a trigger mysql.proc is now accessedMichael Widenius2011-10-061-8/+10
| * | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-22/+118
| * | | | | | | Merge with 5.2Michael Widenius2011-09-101-0/+17
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-0/+17
| * | | | | | | BUG#834534: Assertion `0' failed in replace_where_subcondition with semijoin ...Sergey Petrunya2011-08-291-2/+0
* | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+52
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | BUG#11758262 - 50439: MARK INSERT...SEL...ON DUP KEY UPD,REPLACE...SEL,CREATE...Rohit Kalhans2011-09-291-0/+40
| * | | | | | | manual mergeTatjana Azundris Nuernberg2011-08-081-0/+6
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Bug#11758414/Bug#50614: Default storage_engine not honored when set from with...Tatjana Azundris Nuernberg2011-07-121-0/+6
| | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-07-031-8/+25
| | |\ \ \ \
| | | * | | | Fixed bug#11753738 (formely known as bug#45235) - 5.1 DOES NOT SUPPORT 5.0-ONLYDmitry Shulga2011-06-101-2/+6
| | * | | | | 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-6/+6
| * | | | | | | Bug#12565712 - 61205: "QUERIES PER SECOND AVG" VALUE IN STATUS OUTPUT IS INCO...Marc Alff2011-06-291-1/+1