summaryrefslogtreecommitdiff
path: root/sql/key.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2018-04-241-3/+3
|\
| * register keyword c++17 warningEugene Kosov2018-04-241-2/+2
| * Remove most 'register' use in C++Marko Mäkelä2018-04-241-1/+1
* | omit system invisible fields from the duplicate key errorSergei Golubchik2018-02-241-0/+2
* | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-151-2/+4
|\ \
| * \ Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2018-02-081-2/+4
| |\ \ | | |/
| | * Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-2/+4
| | |\
| | | * Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-2/+4
| | | |\
| | | | * Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-2/+4
| | | | |\
| | | | | * MDEV-14586 Assertion `0' failed in retrieve_auto_increment ...Sachin Setiya2018-01-231-2/+4
* | | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ...Vladislav Vaintroub2018-02-061-8/+8
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-151-11/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2018-01-151-11/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix -Wsign-compare introduced by Compilation speed (#546)Marko Mäkelä2018-01-151-2/+3
| | * | | | Compilation speed (#546)Eugene Kosov2018-01-141-11/+8
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-041-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-021-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-1/+1
* | | | | | Enusure that my_global.h is included firstMichael Widenius2017-08-241-1/+1
|/ / / / /
* | | | | Added "const" to new data for handler::update_row()Michael Widenius2017-04-181-1/+1
|/ / / /
* | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-03-111-13/+2
|\ \ \ \
| * | | | cleanup: TABLE::mark_columns_used_by_index()Sergei Golubchik2017-02-131-2/+1
| * | | | cleanup: remove TABLE::add_read_columns_used_by_indexSergei Golubchik2017-02-131-11/+1
* | | | | MariaRocks port: make key_restore() parameter constSergei Petrunia2016-10-161-1/+1
|/ / / /
* | | | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_differenceAlexander Barkov2016-03-311-3/+2
|/ / /
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-11-191-1/+0
|\ \ \ | |/ /
| * | remove unneded #include's that had a dubious explanationSergei Golubchik2015-10-241-1/+0
* | | MDEV-6650 - LINT_INIT emits code in non-debug buildsSergey Vojtovich2015-03-161-13/+5
|/ /
* | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-0/+1
* | 10.0-base mergeSergei Golubchik2014-02-261-1/+1
|\ \ | |/
| * MySQL-5.5.36 mergeSergei Golubchik2014-02-171-1/+1
| |\
| | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
* | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-5/+5
* | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1Sergei Golubchik2013-11-281-15/+17
* | | MDEV-4786 merge 10.0-monty -> 10.0Sergei Golubchik2013-08-121-2/+2
* | | 10.0-monty mergeSergei Golubchik2013-07-211-17/+17
|\ \ \ | |/ / |/| |
| * | Push a lot of small fixes to get larger parts to compileMichael Widenius2013-05-211-5/+5
| * | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-10/+10
* | | mysql-5.5.31 mergeSergei Golubchik2013-05-071-42/+70
|\ \ \ | |/ / |/| / | |/
| * Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONINGMattias Jonsson2013-01-301-42/+70
| |\
* | \ mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ | |/ /
| * | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ | | |/
| | * Updated/added copyright headersKent Boortz2011-06-301-2/+5
| | |\
* | | \ merge with 5.3Sergei Golubchik2011-10-191-9/+317
|\ \ \ \
| * | | | Fixed compiler warnings and test cases problems found by buildbotMichael Widenius2011-05-111-0/+1
| * | | | Fixed compiler warningsMichael Widenius2011-04-011-0/+6
| * | | | Fixed LP bug #707827.Igor Babaev2011-01-271-6/+2
| * | | | Fixed LP bug #697557.Igor Babaev2011-01-051-20/+2
| * | | | Fixed LP bug #694443.Igor Babaev2010-12-261-2/+7
| * | | | MergeIgor Babaev2010-12-241-0/+248
| |\ \ \ \