summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | | * Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55Sergei Golubchik2017-04-111-3/+3
| | | | | |\
| | | | | | * BUG#25575605: SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING ...Ramil Kalimullin2017-03-142-2/+5
| | | | | | * BUG#25575605: SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING ...Ramil Kalimullin2017-03-105-9/+19
| | | | | | * Updated copyright year in user visible textBalasubramanian Kandasamy2017-01-061-2/+2
| | | | | | * BUG#24437124: POSSIBLE BUFFER OVERFLOW ON CREATE TABLEKarthik Kamath2016-11-101-1/+2
| | | | | | * Bug#24388746: PRIVILEGE ESCALATION AND RACE CONDITION USING CREATE TABLEJon Olav Hauglid2016-08-192-6/+8
| | | | | | * Bug #23296299 : HANDLE_FATAL_SIGNAL (SIG=11) INKailasnath Nagarkar2016-07-011-2/+2
| | * | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-0613-88/+401
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | MDEV-11663 Create services for functionality used by pluginsVladislav Vaintroub2017-04-2712-88/+381
| | | * | | | bugfix: federated/replication did not increment bytes_received status variableSergei Golubchik2017-04-271-0/+20
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.310.3-MDEV-10953Alexander Barkov2017-05-172-2/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-10139 Support for SEQUENCE objectsMonty2017-05-081-1/+3
| * | | | | | Fixed compiler warnings and warnings from build.tagsMonty2017-05-081-1/+1
* | | | | | | Fix that end_bulk_insert() doesn't write to to-be-deleted filesMonty2017-05-173-5/+5
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-04-2413-47/+111
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-2313-47/+111
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-04-193-3/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Added "const" to new data for handler::update_row()Michael Widenius2017-04-183-3/+4
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-04-072-2/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-10139 Support for SEQUENCE objectsMonty2017-04-072-2/+9
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-04-052-25/+36
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-04-052-25/+36
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix the build on Windows.Vladislav Vaintroub2017-04-021-0/+17
| | * | | | | move rocksdb specific changes into rocksdbSergei Golubchik2017-03-311-17/+0
| | * | | | | don't export all charsets to pluginsSergei Golubchik2017-03-311-78/+78
| | * | | | | remove my_hash_const_element(), use Hash_set in C++ codeSergei Golubchik2017-03-311-1/+0
| | * | | | | Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-03-3137-1121/+1623
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-03-1120-269/+325
| | |\ \ \ \ \ \
| | * | | | | | | MDEV-11901 : MariaRocks on WindowsVladislav Vaintroub2017-02-013-103/+114
| | * | | | | | | MariaRocks port: move include/atomic_stat.h into storage/rocksdbSergei Petrunia2017-01-211-94/+0
| | * | | | | | | Merge branch '10.2' of github.com:MariaDB/server into 10.2-mariarocksSergei Petrunia2017-01-0219-141/+537
| | |\ \ \ \ \ \ \
| | * | | | | | | | MariaRocks: port my_hash_const_elementSergei Petrunia2016-10-161-0/+1
| | * | | | | | | | Backport from facebook/mysql-5.6:Sergei Petrunia2016-10-091-0/+94
* | | | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-04-0334-1117/+1618
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /