summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).Nirbhay Choubey2014-03-251-1/+1
* MDEV#5626 : Cannot install InnoDB/XtraDB pluginNirbhay Choubey2014-02-101-6/+0
* Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-2519-133/+308
|\
| * 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 with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-0425-63/+588
|\ \ \ \ | |/ / /
| * | | 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
| | | * | mysql-5.5.33 mergeSergei Golubchik2013-09-063-3/+16
| | | |\ \
| | | | * | Bug#16729109: FIX COMPILATION WARNINGS WITH GCC 4.8Tor Didriksen2013-06-141-2/+2
| | | | * | Bug#16194302: SUPPORT FOR FLOATING-POINT SYSTEM VARIABLESAshish Agarwal2013-05-192-0/+14
| | | * | | MDEV-4165 [PATCH] RFE: make tmpdir a build-time configurable optionSergei Golubchik2013-08-171-0/+7
| * | | | | MDEV-4993:Impossible to free a dynamic columnunknown2013-09-171-15/+15
| * | | | | MDEV-4960 Errors compiling php5.5.3 mysqli extensionSergei Golubchik2013-08-301-0/+6
* | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-0362-922/+1575
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-4871 Temporal literals do not accept nanosecondsAlexander Barkov2013-08-151-0/+7
| * | | | | 10.0-monty mergeSergei Golubchik2013-07-2147-849/+1487
| |\ \ \ \ \
| | * | | | | SHA1 serviceSergei Golubchik2013-07-138-13/+89
| | * | | | | Fix compiler warning - using "const" twice for CHARSET_INFO.Vladislav Vaintroub2013-07-131-2/+2