summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge MariaDB 10.0-base to 10.0.unknown2014-02-101-0/+1
|\
| * Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base.unknown2014-02-101-0/+1
| |\
| | * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-071-0/+1
* | | Automatic mergeMichael Widenius2014-02-051-3/+8
|\ \ \
| * | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-021-3/+8
* | | | mergeSergei Golubchik2014-02-046-54/+83
|\ \ \ \
| * \ \ \ 10.0-base mergeSergei Golubchik2014-02-036-46/+82
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 5.5 mergeSergei Golubchik2014-02-016-49/+85
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | MySQL-5.5.35 mergeSergei Golubchik2014-01-223-41/+74
| | | |\ \
| | | | * | Bug#17513737 INTRODUCE CHECK TABLE...QUICKAnil Toshniwal2013-10-172-46/+70
| | | | * | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7Ashish Agarwal2013-07-022-1/+9
| | | * | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria...Michael Widenius2014-01-222-1/+3
| * | | | | MySQL WL#5522 - InnoDB transportable tablespaces.Sergei Golubchik2014-02-021-5/+0
| * | | | | MDEV-5574 Set AUTO_INCREMENT below max value of column.Sergei Golubchik2014-02-011-3/+1
| | |_|_|/ | |/| | |
* | | | | Removing "#include <sys/timeb.h>" from my_global.h,Alexander Barkov2014-02-041-3/+0
|/ / / /
* | | | 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-095-49/+3
* | | | MDEV-4243 [PATCH] Warnings/errors while compiling with clangSergei Golubchik2013-11-281-56/+59
* | | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1Sergei Golubchik2013-11-282-10/+12
* | | | MroongaSE: addint thd_autoinc and thd_error_context plugin servicesAlexander Barkov2013-12-128-8/+233
* | | | Fixing an MSVC warning about double "const" data type qualifierAlexander Barkov2013-12-051-1/+1
* | | | merge 10-base->10.0unknown2013-11-112-0/+81
|\ \ \ \ | |/ / /
| * | | Merge 5.5 -> 10.0-baseAlexander Barkov2013-11-082-0/+81
| |\ \ \ | | |/ /
| | * | Added usage of handler error names to mysqltestMichael Widenius2013-11-052-0/+81
* | | | MDEV-5241: Collation incompatibilities with MySQL-5.6Michael Widenius2013-11-092-0/+31
* | | | 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
* | | | | A few minor Unicode collation customization improvements were made,Alexander Barkov2013-10-311-2/+14
* | | | | 10.0-base merge (roles)Sergei Golubchik2013-10-292-3/+7
|\ \ \ \ \ | |/ / / /
| * | | | post-review changesSergei Golubchik2013-10-181-1/+1
| * | | | support DEFINER=role and DEFINER=current_roleSergei Golubchik2013-10-181-3/+3
| * | | | Free some memory leaksVicențiu Ciorbaru2013-10-171-0/+1
| * | | | Added a delete_function for DYNAMIC_ARRAY.Vicențiu Ciorbaru2013-10-171-0/+3
| * | | | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-59/+56
* | | | | MDEV-5180 Data type for WEIGHT_STRING is too short in some casesAlexander Barkov2013-10-251-0/+2
* | | | | MDEV-5084: Missing C++ support in ma_dyncol.hunknown2013-10-071-0/+6
* | | | | MDEV-5085: Dynamic columns require inclusion of my_sys.h and my_global.hunknown2013-10-071-0/+18
* | | | | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6Alexander Barkov2013-10-231-8/+23
* | | | | Client attributesunknown2013-10-035-1/+10
* | | | | MDEV-4928 Merge collation customization improvements Alexander Barkov2013-10-024-28/+114
* | | | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6Alexander Barkov2013-09-231-1/+14
* | | | | 10.0-base merge.Sergei Golubchik2013-09-2111-5/+209
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-1811-5/+209
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax error...Sergei Golubchik2013-09-091-1/+1
| | * | | MDEV-4472 Audit-plugin. Server-related part of the task.Alexey Botchkov2013-09-098-1/+185