summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-4/+4
* Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-2/+20
|\
| * 5.3->5.5 mergeSergei Golubchik2012-11-221-2/+12
| |\
| | * MDEV-3810 fix.unknown2012-11-091-2/+12
| | * Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-0/+8
| | |\
| | | * Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-0/+8
| | | |\
| | | | * Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-0/+8
| | | | |\
| | * | | \ 5.2 merge.Sergei Golubchik2012-08-221-0/+8
| | |\ \ \ \ | | | |/ / /
| | | * | | 5.1 mergeSergei Golubchik2012-08-221-0/+8
| | | |\ \ \ | | | | |/ /
| | | | * | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-0/+8
| | | | |\ \
| | * | | \ \ 5.2 mergeSergei Golubchik2012-05-201-3/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | 5.1 mergeSergei Golubchik2012-05-181-3/+3
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | merge with mysql-5.1.63Sergei Golubchik2012-05-171-3/+3
| | | | |\ \ \
| * | | | \ \ \ mysql-5.5.28Sergei Golubchik2012-10-161-0/+8
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge from 5.1 to 5.5Praveenkumar Hulakund2012-07-261-0/+8
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | BUG#13868860 - LIMIT '5' IS EXECUTED WITHOUT ERROR WHEN '5' Praveenkumar Hulakund2012-07-261-0/+8
| | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Backport 5.5=>5.1 Patch for Bug#13805127: Tor Didriksen2012-04-181-0/+8
| | | | |_|_|/ | | | |/| | |
* | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | MWL#182: Explain running statements: merge with 5.3-main (needs fixing)Sergey Petrunya2012-01-031-0/+1
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ MWL#182: Explain running statementsSergey Petrunya2011-10-271-0/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | MWL#182: Explain running statementsSergey Petrunya2011-08-231-0/+1
* | | | | | | | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-031-0/+2
|/ / / / / / / / /
* | | | | | | | | mysql 5.5.23 mergeSergei Golubchik2012-04-101-3/+11
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Patch for Bug#13805127: Stored program cache produces wrong result in same THD.Tor Didriksen2012-03-291-0/+8
| * | | | | | | | Merge from 5.1 to 5.5Praveenkumar Hulakund2012-02-291-3/+3
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Bug#12601974 - STORED PROCEDURE SQL_MODE=NO_BACKSLASH_ESCAPES IGNORED AND BRE...Praveenkumar Hulakund2012-02-291-3/+3
* | | | | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
* | | | | | | | | merge with mysql-5.5.21Sergei Golubchik2012-03-091-0/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fixed bug#11753187 (formerly known as bug 44585): SP_CACHE BEHAVES ASDmitry Shulga2012-01-251-0/+6
* | | | | | | | | 5.3.4 mergeSergei Golubchik2012-02-151-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view.unknown2012-02-031-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | 5.3 mergeSergei Golubchik2012-01-131-4/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Rewrite IGNORE handling:Michael Widenius2011-12-111-3/+0
| * | | | | | | Merge with 5.2.Michael Widenius2011-12-111-11/+11
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-11/+11
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-11/+11
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
* | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | BUG#834534: Assertion `0' failed in replace_where_subcondition with semijoin ...Sergey Petrunya2011-08-291-1/+0
| | |_|_|_|/ | |/| | | |
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-08-021-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-021-2/+2
* | | | | | merge with 5.3Sergei Golubchik2011-10-191-34/+133
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fixed LP bug #794890.Igor Babaev2011-06-131-5/+8
| * | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-16/+42
| |\ \ \ \ \
| | * | | | | Fixed bugs causing failures fot the funcs_1 test suite.Igor Babaev2011-06-031-1/+6
| | * | | | | MergeIgor Babaev2011-05-201-15/+36
| | |\ \ \ \ \
| | | * \ \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-15/+36
| | | |\ \ \ \ \
| | | | * | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-15/+36
View Lorry Controller Status