summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0-galera into 10.1Sergei Golubchik2015-02-061-1/+1
|\
| * bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-1/+1
| |\
| * | MDEV-6740 : Galera crash in rpl_sql_thread_info/cached_charset_compareNirbhay Choubey2014-09-221-1/+5
| * | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-1/+1
| |\ \
| * \ \ * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-3/+3
| |\ \ \
| * \ \ \ Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-2/+19
| |\ \ \ \
| * \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-6/+37
| |\ \ \ \ \
| * \ \ \ \ \ Merge 10.0 to galera-10.0Jan Lindström2013-09-031-46/+72
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-6/+7
| |\ \ \ \ \ \ \
| * | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-1/+19
* | | | | | | | | cleanup: comments referring to non-extistent Item classesSergei Golubchik2014-12-041-1/+1
* | | | | | | | | MDEV-6980 OUT parameters in PREPARESergei Golubchik2014-12-041-29/+0
* | | | | | | | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | MDEV-5231: Per query variables from Percona Server (rewritten)Oleksandr Byelkin2014-11-111-3/+5
* | | | | | | | MDEV-6603 SBR failure upon executing a prepared statement with input placehol...Sergei Golubchik2014-10-101-0/+2
* | | | | | | | cleanup: query rewrites for Item_param and Item_splocalSergei Golubchik2014-10-101-41/+31
* | | | | | | | MDEV-5317 Compound statement / anonymous blocksSergei Golubchik2014-10-101-6/+11
* | | | | | | | MDEV-5317 out parameters in PREPARE "SELECT ... INTO"Sergei Golubchik2014-10-101-0/+29
* | | | | | | | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-0/+2
* | | | | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-271-1/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-1/+23
| |/ / / / / / /
* | | | | | | | MDEV-6575: main.view --ps-protocol fails in ANALYZE codeSergei Petrunia2014-08-131-1/+18
* | | | | | | | Made sql_log_slow a session variableMonty2014-08-091-1/+1
|/ / / / / / /
* | | | | | | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron...Sergei Golubchik2014-05-131-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-2/+2
* | | | | | 10.0-base mergeSergei Golubchik2014-02-031-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 5.5 mergeSergei Golubchik2014-02-011-1/+1
| |\ \ \ \ \
| | * \ \ \ \ MySQL-5.5.35 mergeSergei Golubchik2014-01-221-1/+1
| | |\ \ \ \ \
| | | * | | | | Bug#16346241 - SERVER CRASH IN ITEM_PARAM::QUERY_VAL_STRNeeraj Bisht2013-08-281-1/+1
* | | | | | | | 10.0-base mergeSergei Golubchik2013-12-161-2/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 5.5 mergeSergei Golubchik2013-11-231-2/+19
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | mysql-5.5.34 mergeSergei Golubchik2013-11-191-2/+19
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEARDmitry Lenev2013-08-201-1/+18
* | | | | | | 10.0-base mergeSergei Golubchik2013-11-131-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.5. mergeSergei Golubchik2013-11-131-4/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-4824 userstats - wrong user statisticsSergei Golubchik2013-11-111-4/+4
* | | | | | | merge 10.0-base -> 10.0unknown2013-10-291-1/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | merge 5.5->10.0-baseunknown2013-10-291-1/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge 5.3->5.5unknown2013-10-291-1/+7
| | |\ \ \ \ \
| | | * | | | | MDEV-5143: update of a joined table with a nested subquery with a syntax erro...unknown2013-10-211-1/+7
* | | | | | | | merge 10.0-base -> 10.0unknown2013-10-171-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 5.5 -> 10.0-baseAlexander Barkov2013-10-161-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | MDEV-4981: Account for queries handled by query-cache in USER_STATISTICS (and...unknown2013-10-161-0/+6
* | | | | | | | Merge 10.0-base -> 10.0Sergey Petrunya2013-10-161-0/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | MDEV-5117: Explain for a query executed as a PS is not written into the slow logSergey Petrunya2013-10-151-2/+15
| * | | | | | | MDEV-3798: EXPLAIN UPDATE/DELETESergey Petrunya2013-10-051-3/+3
| * | | | | | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-08-241-0/+3
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-06-271-0/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-06-211-2/+1