summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | | 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 branch '10.0' into 10.1Sergei Golubchik2017-03-212-2/+45
|\ \ \ \ | |/ / /
| * | | compiler warningSergei Golubchik2017-03-161-2/+2
| * | | MDEV-12261 build failure without P_SSergei Golubchik2017-03-152-2/+45
* | | | Correct FSF addressiangilfillan2017-03-1013-13/+13
* | | | MDEV-11752 Unsafe strmov - function definition in include/m_string.hSergei Golubchik2017-03-101-0/+2
* | | | small plugin API related fixesSergei Golubchik2017-03-102-2/+6
* | | | cleanup: sort various lists of servicesSergei Golubchik2017-03-107-1110/+1109
* | | | thd_rnd serviceSergei Golubchik2017-03-108-0/+94
* | | | Auth Plugin API: add THD to MYSQL_SERVER_AUTH_INFOSergei Golubchik2017-03-102-1/+7
* | | | base64 serviceSergei Golubchik2017-03-109-62/+164
* | | | remove old API for SHA2Sergei Golubchik2017-03-101-72/+0
* | | | my_sha2 serviceSergei Golubchik2017-03-109-4/+386
* | | | cleanup: generalize my_sha1.ccSergei Golubchik2017-03-101-25/+0
* | | | make sql_udf.cc to shorten dlerror() messagesSergei Golubchik2017-03-101-0/+2
* | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-093-44/+9
|\ \ \ \ | |/ / /
| * | | Revert "Add extra HA_ERR message that Percona introduced within TokuDB 5.6.35...Vicențiu Ciorbaru2017-03-062-4/+2
| * | | Add extra HA_ERR message that Percona introduced within TokuDB 5.6.35-80Vicențiu Ciorbaru2017-03-052-2/+4
| * | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-033-45/+9
| |\ \ \ | | |/ /
| | * | bugfix: remove my_delete_with_symlink()Sergei Golubchik2017-02-272-42/+0
| | * | race-condition safe implementation of mi_delete_table/maria_delete_tableSergei Golubchik2017-02-271-0/+3
| | * | MDEV-11902 mi_open race conditionSergei Golubchik2017-02-271-3/+3
| | * | cleanup: mysys_test_invalid_symlinkSergei Golubchik2017-02-271-0/+2
| | * | Fix for memory leak in applications, like QT,that callsMonty2017-01-271-1/+1
* | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-031-4/+3
|\ \ \ \ | |/ / /
| * | | Windows : Fix server compile errors when compile with /Zc:strictStrings optionVladislav Vaintroub2017-02-281-4/+3
* | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-0/+4
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-0/+4
| |\ \ \ | | |/ /
| | * | move check_user/set_user from mysqld.cc to mysysSergei Golubchik2016-12-221-0/+4
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-0/+3
|\ \ \ \ | |/ / /
| * | | MDEV-11343 LOAD DATA INFILE fails to load data with an escape character follo...Alexander Barkov2016-11-291-0/+3
* | | | MDEV-10759 Fix Aria to support 2-byte collation IDsMonty2016-12-022-2/+2
* | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-022-18/+0
|\ \ \ \
| * \ \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-284-22/+3
| |\ \ \ \ | | |/ / /
| | * | | MDEV-10951 Field_newdate::cmp access violationVladislav Vaintroub2016-10-252-18/+0
| * | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-243-3/+3
| |\ \ \ \