summaryrefslogtreecommitdiff
path: root/include/mysql
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5.5' into 10.0Sergei Golubchik2017-04-211-1/+0
|\
| * MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_keyâ...Sergei Golubchik2017-04-201-0/+47
* | compiler warningSergei Golubchik2017-03-161-2/+2
* | MDEV-12261 build failure without P_SSergei Golubchik2017-03-151-0/+44
* | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-032-40/+1
|\ \ | |/
| * bugfix: remove my_delete_with_symlink()Sergei Golubchik2017-02-271-41/+0
* | Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-1/+1
* | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2015-12-132-0/+3
|\ \
| * | 5.6.28Sergei Golubchik2015-12-132-0/+3
* | | Correct comments before mysql_socket_{g|s}etfd to refer to the right functionDaniel Black2015-12-111-2/+2
* | | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-116-52/+0
|\ \ \ | | |/ | |/|
| * | MDEV-8052 abi detection incorrect with clangSergei Golubchik2015-06-036-40/+0
* | | perfschema 5.6.24Sergei Golubchik2015-05-055-79/+32
|\ \ \ | | |/ | |/|
| * | 5.6.24Sergei Golubchik2015-05-045-79/+32
* | | perfschema 5.6.17Sergei Golubchik2014-05-075-6/+6
|\ \ \ | |/ /
| * | 5.6.17Sergei Golubchik2014-05-076-8/+8
* | | null-merge from perfschema-5.6 merge treeSergei Golubchik2014-05-072-11/+0
|\ \ \ | |/ /
| * | perfschema 5.6.10 initial commit.Sergei Golubchik2014-05-0714-0/+7835
| /
* | MDEV-5914: Parallel replication deadlock due to InnoDB lock conflictsunknown2014-03-214-0/+4
* | Merge with 10.0-baseMichael Widenius2014-03-131-0/+10
|\ \
* | | Fixed MDEV-5780 "create-big fails in 10.0"Michael Widenius2014-03-101-2/+2
* | | 10.0-base mergeSergei Golubchik2014-02-263-7/+7
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2014-02-253-5/+5
| |\ \ | | |/
| | * MySQL-5.5.36 mergeSergei Golubchik2014-02-173-5/+5
| | |\
| | | * Updated/added copyright headersMurthy Narkedimilli2014-01-062-2/+2
| | | * Bug#17702677 WRONG INSTRUMENTATION INTERFACE FOR MYSQL_COND_TIMEDWAITMarc Alff2013-11-061-2/+2
| | | * WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7Ashish Agarwal2013-07-022-1/+9
* | | | remove a deprecated API function from the plugin.hSergei Golubchik2013-12-224-15/+0
* | | | 10.0-base mergeSergei Golubchik2013-12-161-1/+1
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-12-151-1/+1
| |\ \ \ | | |/ /
| | * | Fixed compiler errors and warningsMichael Widenius2013-12-021-1/+1
* | | | Do the partial merge of WL#5602 correctly:Sergei Golubchik2013-12-091-13/+0
* | | | MroongaSE: addint thd_autoinc and thd_error_context plugin servicesAlexander Barkov2013-12-127-7/+231
* | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-014-0/+38
|\ \ \ \ | |/ / /
| * | | Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-014-0/+38
| |\ \ \
| | * | | MDEV-4506: Parallel replication: error handling.unknown2013-10-144-4/+4
| | * | | MDEV-4506: Parallel replication. Intermediate commit.unknown2013-06-264-0/+38
* | | | | Client attributesunknown2013-10-031-0/+1
* | | | | 10.0-base merge.Sergei Golubchik2013-09-217-1/+194
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-187-1/+194
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | MDEV-4472 Audit-plugin. Server-related part of the task.Alexey Botchkov2013-09-096-1/+183
| | * | mysql-5.5.33 mergeSergei Golubchik2013-09-061-0/+11
| | |\ \ | | | |/
| | | * Bug#16194302: SUPPORT FOR FLOATING-POINT SYSTEM VARIABLESAshish Agarwal2013-05-191-0/+11
| | | * Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191-1/+1
* | | | 10.0-monty mergeSergei Golubchik2013-07-2119-320/+664
|\ \ \ \
| * | | | SHA1 serviceSergei Golubchik2013-07-136-1/+80
| * | | | MDEV-4058unknown2013-06-271-0/+21
| * | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-2616-314/+557
* | | | | Merge from 10.0-connectAlexander Barkov2013-06-086-1/+143
|\ \ \ \ \
| * | | | | Fixing the problem with my_bool_t defined two times.Alexander Barkov2013-06-035-4/+5
View Lorry Controller Status