summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6Alexander Barkov2013-10-231-2/+6
* 10.0-monty mergeSergei Golubchik2013-07-211-5/+6
|\
| * Applied all changes from Igor and SanjaMichael Widenius2013-06-151-1/+2
| * Temporary commit of 10.0-mergeMichael Widenius2013-03-261-4/+4
* | 10.0-base mergeSergei Golubchik2013-07-181-9/+9
|\ \
| * \ 5.5 mergeSergei Golubchik2013-07-171-9/+9
| |\ \
| | * \ mysql-5.5.32 mergeSergei Golubchik2013-07-161-1/+1
| | |\ \
| | | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191-1/+1
| | * | | Merging from 5.3Alexander Barkov2013-07-081-1/+1
| | |\ \ \
| | | * | | MDEV-4667 DATE('string') incompability between mysql and mariadbSergei Golubchik2013-07-031-1/+1
| | * | | | Fixed some cache variables that could be set to higher value than what the co...Michael Widenius2013-06-061-9/+9
* | | | | | 10.0-base mergeSergei Golubchik2013-04-151-1/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | 5.5 mergeSergei Golubchik2013-03-271-1/+4
| |\ \ \ \ | | |/ / /
| | * | | 5.3 mergeSergei Golubchik2013-03-271-1/+4
| | |\ \ \ | | | |/ /
| | | * | MDEV-4281 Assertion `maybe_null && item->null_value' fails in make_sortkey on...Sergei Golubchik2013-03-171-1/+4
* | | | | 10.0-base mergeSergei Golubchik2013-01-311-23/+21
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2013-01-291-18/+11
| |\ \ \ \ | | |/ / /
| | * | | 5.3 mergeSergei Golubchik2013-01-281-17/+8
| | |\ \ \ | | | |/ /
| | | * | MDEV-3875 Wrong result (missing row) on a DISTINCT query with the same subque...Sergei Golubchik2013-01-261-17/+8
| | | * | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-1/+1
| | | |\ \
| | | | * \ Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-3/+2
| | | | |\ \
| | | | | * \ Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-3/+2
| | | | | |\ \
| | * | | | \ \ mysql-5.5.29 mergeSergei Golubchik2013-01-151-0/+5
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITHAnnamalai Gurusami2012-10-081-1/+7
| | | * | | | | Bug#14542543 FIX BUG #12694872 IN 5.5Tor Didriksen2012-09-181-0/+3
| * | | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-5/+10
* | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-4/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-171-4/+0
| * | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
* | | | | | | | merge with 5.5Sergei Golubchik2012-11-031-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | mysql-5.5.28Sergei Golubchik2012-10-161-2/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | merge 5.1 => 5.5Tor Didriksen2012-07-271-4/+2
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Bug#14111180 HANDLE_FATAL_SIGNAL IN PTR_COMPARE_1 / QUEUE_INSERTTor Didriksen2012-07-271-3/+2
* | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-174/+400
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-12/+11
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-12/+11
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | MWL#182: Explain running statementsSergey Petrunya2012-06-251-5/+0
| | | * | | | | | SHOW EXPLAIN: Code cleanupSergey Petrunya2012-06-081-3/+0
| | | * | | | | | Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5}Sergey Petrunya2012-05-171-9/+16
| | | |\ \ \ \ \ \
| | | | * | | | | | MDEV-238: SHOW EXPLAIN: Server crashes in JOIN::print_explain with FROM subqu...Sergey Petrunya2012-05-101-0/+6
| | | | * | | | | | MWL#182: Explain running statementsSergey Petrunya2012-04-261-9/+11
| * | | | | | | | | Merge MDEV-415 -> 10.0-base.Igor Babaev2012-09-011-163/+389
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line.Igor Babaev2012-09-011-160/+389
| | |/ / / / / / /
| * | | | | | | | Merge from 5.3unknown2012-08-241-5/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Corrected the pactch for mdev-449 to fix valgrind failures.Igor Babaev2012-08-141-3/+3
| | * | | | | | Fixed bug mdev-449.Igor Babaev2012-08-131-5/+7
| | |/ / / / /
* | | | | | | fixes for test failuresSergei Golubchik2012-09-271-7/+7
|/ / / / / /
* | | | | | mysql 5.5.23 mergeSergei Golubchik2012-04-101-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge the 5.5.22 release build into main 5.5,Joerg Bruehe2012-03-201-100/+107
| |\ \ \ \ \
| * | | | | | Bug#13832772 ASSERTION `THD->IS_ERROR() || KILL_ERRNO'Tor Didriksen2012-03-141-1/+1
View Lorry Controller Status