summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* 10.0-monty mergeSergei Golubchik2013-07-211-44/+69
|\
| * merge of 2876.430.11 & 2876.430.1unknown2013-06-271-0/+1
| * A fix of unions with duplicate rows and returning bug fix for lp:732124 union...unknown2013-06-261-2/+2
| * Fixed some memory leaksMichael Widenius2013-06-191-2/+2
| * Finished merging wl5986 started by Igor.unknown2013-06-191-2/+2
| * Fixed some merge issues:Michael Widenius2013-06-181-0/+31
| * More merge fixes:Michael Widenius2013-06-161-16/+16
| * Fixed patch that was part of last push that didn't apply correctly.Michael Widenius2013-06-151-10/+7
| * Applied all changes from Igor and SanjaMichael Widenius2013-06-151-24/+20
| * Temporary commit of 10.0-mergeMichael Widenius2013-03-261-1/+1
* | 10.0-base mergeSergei Golubchik2013-07-181-0/+1
|\ \
| * | MDEV-4660 SHUTDOWN commandSergei Golubchik2013-06-241-0/+1
* | | Adding support for MySQL-5.6 temporal column types:Alexander Barkov2013-07-101-2/+2
* | | 10.0-base mergeSergei Golubchik2013-06-061-4/+5
|\ \ \ | |/ / | | / | |/ |/|
| * 5.5 mergeSergei Golubchik2013-06-061-4/+5
| |\
| | * 5.3 merge.Sergei Golubchik2013-05-201-1/+1
| | |\
| | | * 5.2 mergeSergei Golubchik2013-05-201-1/+1
| | | |\
| | | | * 5.1 mergeSergei Golubchik2013-05-201-1/+1
| | | | |\
| | | | | * MDEV-4326 fix.unknown2013-04-091-1/+1
| | * | | | mysql-5.5.31 mergeSergei Golubchik2013-05-071-3/+4
| | |\ \ \ \
| | | * | | | Bug#11757464:SERVER CRASH IN RECURSIVE CALL WHEN OOMNisha Gopalakrishnan2013-01-151-3/+4
* | | | | | | 10.0-base mergeSergei Golubchik2013-01-311-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | cleanup:Sergei Golubchik2013-01-231-1/+1
| * | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-4/+4
* | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-2/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| | | | | |\ \ \ \
* | | | | | \ \ \ \ merge with 5.5Sergei Golubchik2012-11-031-0/+8
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-0/+3
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | 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
| |/ / / / / / / / /
* | | | | | | | | | fixes for test failuresSergei Golubchik2012-09-271-3/+3
View Lorry Controller Status