summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2017-08-264-18/+27
|\
| * 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
* | | | | | | compilation failure in oqgraph after 4aaa38d26ed9Sergei Golubchik2017-08-261-11/+20
* | | | | | | Remove dumping of some not needed core's when running test suiteMichael Widenius2017-08-241-2/+2
* | | | | | | New option for slow logging (log_slow_disable_statements)Monty2017-08-241-0/+1
* | | | | | | Added DBUG_ASSERT_AS_PRINTF compile flagMonty2017-08-243-5/+19
* | | | | | | Fix compilation warnings in pluginsSergei Golubchik2017-08-246-39/+21
* | | | | | | Enusure that my_global.h is included firstMichael Widenius2017-08-2418-29/+0
* | | | | | | MDEV-11159 Server proxy protocol supportVladislav Vaintroub2017-08-221-0/+2
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-08-151-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Changed the function my_set_bits() to return uint64 instead of uint32.Igor Babaev2017-08-141-2/+2
* | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-07-072-4/+13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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/bb-10.2-ext' into 10.3Alexander Barkov2017-07-051-11/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 bb-10.2-ext into 10.3Marko Mäkelä2017-06-193-3/+19
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 branch 'bb-10.2-ext' into 10.3Marko Mäkelä2017-06-0217-105/+481
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| | | | |\ \ \ | | | | | |/ /
| | | | | * | MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_keyâ...Sergei Golubchik2017-04-202-2/+48