summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* MDEV-12583 : Bake the git hash into the binaries.Vladislav Vaintroub2017-09-211-0/+1
* Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-203-14/+54
|\
| * MDEV-13712 Spelling errors in the error messageSergei Golubchik2017-09-181-13/+13
| * MDEV-13773 client packages need my_global.h and/or my_config.hSergei Golubchik2017-09-181-0/+19
| * MDEV-12763 10.2 uses deprecated openssl 1.0 apis even with 1.1Sergei Golubchik2017-09-181-1/+22
* | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-012-2/+31
|\ \ | |/
| * Add ATTRIBUTE_NORETURN and ATTRIBUTE_COLDMarko Mäkelä2017-08-311-0/+23
| * Merge 10.1 into 10.2Marko Mäkelä2017-08-311-2/+8
| |\
| | * Merge remote-tracking branch 'origin/10.0-galera' into 10.1Jan Lindström2017-08-211-2/+8
| | |\
| | | * Merge tag 'mariadb-10.0.32' into 10.0-galeraJan Lindström2017-08-094-6/+7
| | | |\
| | | * \ Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-303-4/+9
| | | |\ \
| | | * \ \ Merge branch '10.0' into bb-10.0-galeraSachin Setiya2017-03-202-2/+45
| | | |\ \ \
| | | * \ \ \ Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-174-49/+12
| | | |\ \ \ \
| | | * \ \ \ \ Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-132-0/+7
| | | |\ \ \ \ \
* | | | \ \ \ \ \ Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-253-18/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-172-5/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-083-6/+5
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-07-252-5/+4
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2017-07-182-1/+2
| | | | |\ \ \ \ \ \
| | | | | * | | | | | BUG#25451091:CREATE TABLE DATA DIRECTORY / INDEX DIRECTORYNisha Gopalakrishnan2017-05-121-2/+14
| | | | | * | | | | | BUG#25575605: SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING ...Ramil Kalimullin2017-03-132-2/+5
| | | | | * | | | | | BUG#25575605: SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING ...Ramil Kalimullin2017-03-105-9/+19
| | | | | * | | | | | BUG#24807826: UINT3KORR SHOULD STOP READING FOUR INSTEAD OFKarthik Kamath2017-03-091-11/+1
| | | | * | | | | | | MDEV-12144 Signal 6 crash corrupts ibd filesSergei Golubchik2017-07-151-3/+2
| | | * | | | | | | | MDEV-11896 thd_get_error_context_description race conditionSergei Golubchik2017-07-201-1/+1
| * | | | | | | | | | MDEV-13370 Ambiguous behaviour regarding installation of header filesSergei Golubchik2017-08-141-4/+10
| * | | | | | | | | | don't install same files twiceSergei Golubchik2017-08-141-10/+13
* | | | | | | | | | | Changed the function my_set_bits() to return uint64 instead of uint32.Igor Babaev2017-08-141-2/+2
* | | | | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-072-4/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fixed build failure on WindowsSergey Vojtovich2017-07-061-3/+10
| * | | | | | | | | | Remove obsolete synonyms for access bitsFredrik Fornwall2017-07-061-3/+3
| * | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-07-051-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-06-301-0/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-06-281-0/+2
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | | * | | | | | MDEV-13187 incorrect backslash parsing in clientsSergei Golubchik2017-06-271-0/+2
* | | | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-041-11/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Simplify IO_CACHE by removing current_pos and end_pos as self-referencesVicențiu Ciorbaru2017-06-281-11/+9
* | | | | | | | | | Merge 10.2 into bb-10.2-ext; also, fix MDEV-13015 After restart, InnoDB wrong...Marko Mäkelä2017-06-152-3/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | MDEV-12471: BULK CommandOleksandr Byelkin2017-06-142-3/+13
* | | | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-0/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-221-0/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-05-191-0/+6
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | MDEV-12420 max_recursive_iterations did not prevent a stack-overflow and segf...Sergei Golubchik2017-05-151-3/+6
| | | * | | | | | | WIP: global readonly variable pcre_frame_sizeDaniel Black2017-05-151-0/+3
* | | | | | | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-2617-105/+481
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSLSergei Golubchik2017-05-093-27/+75
| * | | | | | | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSLGeorg Richter2017-05-092-4/+20
| * | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-092-4/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch '10.0' 10.1Sergei Golubchik2017-04-282-4/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-04-212-4/+3
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | |