summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-303-4/+9
|\
| * 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 '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 branch '10.0' into bb-10.0-galeraSachin Setiya2017-03-202-2/+45
|\ \ \ \ | |/ / /
| * | | compiler warningSergei Golubchik2017-03-161-2/+2
| * | | MDEV-12261 build failure without P_SSergei Golubchik2017-03-152-2/+45
* | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-174-49/+12
|\ \ \ \ | |/ / /
| * | | 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
| * | | Windows : Fix server compile errors when compile with /Zc:strictStrings optionVladislav Vaintroub2017-02-281-4/+3
* | | | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-132-0/+7
|\ \ \ \ | |/ / /
| * | | 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
| * | | MDEV-11343 LOAD DATA INFILE fails to load data with an escape character follo...Alexander Barkov2016-11-291-0/+3
* | | | 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 '5.5' into 10.0Sergei Golubchik2016-09-272-4/+3
| |\ \ \ | | |/ /
| | * | MDEV-10725 Server 10.1.17 fails to build using clang with c++11Sergei Golubchik2016-09-261-2/+1
| | * | don't use my_copystat in the serverSergei Golubchik2016-09-121-2/+2
* | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-243-3/+3
|\ \ \ \ | |/ / /
| * | | Fixed "Packets out of order" warning message on stdout in clients,Monty2016-08-212-2/+2
| * | | [MDEV-9127] Crash reporter often fails to show the query that crashedVicențiu Ciorbaru2016-07-121-1/+1
* | | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-243-2/+9
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-213-2/+9
| |\ \ \ | | |/ /
| | * | Fixed compilation failure using clangVicențiu Ciorbaru2016-06-141-1/+2
| | * | MDEV-10166 probes_mysql_nodtrace.h is not provided anymore by mariadb-10.0.25Sergei Golubchik2016-06-141-0/+6
| | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-06-141-1/+1
| | |\ \ | | | |/
| | | * BUG#22594514: HANDLE_FATAL_SIGNAL (SIG=11) INNisha Gopalakrishnan2016-03-171-2/+2
| | | * WL#9072: Backport WL#8785 to 5.5Ramil Kalimullin2016-02-193-5/+27
| | * | MDEV-9366 : do_shutdown_server fails to detect server shutdown on Windows.Vladislav Vaintroub2016-06-081-1/+1
* | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-292-2/+2
|\ \ \ \ | |/ / /
| * | | Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-1/+1
| * | | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-1/+1
* | | | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-236-21/+14
|\ \ \ \ | |/ / /
| * | | Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24Sergei Golubchik2016-02-173-18/+7
| |\ \ \