summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2013-01-311-23/+50
|\
| * MDEV-3984: Double free of Master_info * when CHANGE MASTER fails.unknown2013-01-301-5/+10
| * 5.5 mergeSergei Golubchik2013-01-291-12/+34
| |\
| | * 5.3 mergeSergei Golubchik2013-01-251-1/+14
| | |\
| | | * 5.2 mergeSergei Golubchik2013-01-251-1/+16
| | | |\
| | | | * MDEV-3915 COM_CHANGE_USER allows fast password brute-forcingSergei Golubchik2013-01-251-1/+16
| | | * | 5.2 merge.Sergei Golubchik2012-08-221-3/+9
| | | |\ \ | | | | |/
| | | | * 5.1 mergeSergei Golubchik2012-08-221-3/+9
| | | | |\
| | | | | * merge with MySQL 5.1.65Sergei Golubchik2012-08-221-3/+9
| | | | | |\
| | | | | | * Bug#12636001 : deadlock from thd_security_contextGopal Shankar2012-05-171-2/+3
| | | * | | | 5.2 mergeSergei Golubchik2012-05-201-2/+3
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | 5.1 mergeSergei Golubchik2012-05-181-2/+3
| | | | |\ \ \ | | | | | |/ /
| | | | | * | merge with mysql-5.1.63Sergei Golubchik2012-05-171-2/+3
| | | | | |\ \
| | * | | | \ \ mysql-5.5.29 mergeSergei Golubchik2013-01-151-2/+7
| | |\ \ \ \ \ \
| | | * | | | | | Bug #15948123: SERVER WORKS INCORRECT WITH LONG TABLE ALIASESGleb Shchepa2012-12-051-2/+7
| | | * | | | | | Bug#14003080:65104: MAX_USER_CONNECTIONS WITH PROCESSLIST EMPTYPraveenkumar Hulakund2012-05-281-3/+4
| | * | | | | | | Fixed some race conditons and bugs related to killed queriesMichael Widenius2013-01-111-9/+13
| * | | | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-6/+6
* | | | | | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-1/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-1/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fixed the CREATE TABLE IF EXIST generates warnings instead of errorsMichael Widenius2012-12-171-1/+8
* | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-13/+28
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | MDEV-438 Microseconds: Precision is ignored in CURRENT_TIMESTAMP(N) when it i...Sergei Golubchik2012-12-171-3/+7
| * | | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-1/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix yet another regression after MDEV-3885.Vladislav Vaintroub2012-11-271-1/+3
| | * | | | | | | fix regression in sp_notembedded after MDEV-3885Vladislav Vaintroub2012-11-271-1/+1
| | * | | | | | | MDEV-3885 - connection suicide via mysql_kill() causes assertion in serverVladislav Vaintroub2012-11-271-1/+1
| * | | | | | | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-11/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-11/+14
* | | | | | | | | | MDEV-3816 init-file stops getting executed if a long enough line is encounter...Sergei Golubchik2012-12-161-11/+42
* | | | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-75/+222
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-12/+56
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | MDEV-462: SHOW EXPLAIN: Assertion `table_list->table' fails in find_field_in_...Sergey Petrunya2012-10-061-1/+2
| | * | | | | | | | | SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-12/+55
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | MWL#182: Explain running statements: Address feedback:Sergey Petrunya2012-08-081-13/+29
| | | * | | | | | | | Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-251-1/+7
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | MWL#182: Explain running statementsSergey Petrunya2012-07-171-3/+3
| | | * | | | | | | | | MWL#182: Explain running statements: address review feedbackSergey Petrunya2012-07-101-29/+26
| | | * | | | | | | | | MWL#182: Explain running statements: address review feedbackSergey Petrunya2012-06-291-1/+4
| | | * | | | | | | | | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-0/+27
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ MWL#182: Explain running statements: merge with 5.3-main (needs fixing)Sergey Petrunya2012-01-031-0/+27
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ MWL#182: Explain running statementsSergey Petrunya2011-10-271-0/+27
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | MWL#182: Explain running statementsSergey Petrunya2011-08-231-0/+27
| * | | | | | | | | | | | | | Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-10-041-28/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-031-2/+28
| | * | | | | | | | | | | | | Fixed issues found by QA (Elena)Michael Widenius2012-09-281-0/+1
| | * | | | | | | | | | | | | Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-09-281-29/+78
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Automatic mergeMichael Widenius2012-09-221-28/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | This fix+comments was originally made by Alexey KopytovMichael Widenius2012-09-181-0/+1
| | * | | | | | | | | | | | Added THD::utime_after_query to avoid calling current_utime() twice for every...Michael Widenius2012-09-131-28/+20