Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MariaDB 10.0-base to 10.0. | unknown | 2014-02-10 | 1 | -0/+1 |
|\ | |||||
| * | Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base. | unknown | 2014-02-10 | 1 | -0/+1 |
| |\ | |||||
| | * | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID. | unknown | 2014-02-07 | 1 | -0/+1 |
* | | | Automatic merge | Michael Widenius | 2014-02-05 | 1 | -3/+8 |
|\ \ \ | |||||
| * | | | Fixes to get valgrind to work with jemalloc | Michael Widenius | 2014-01-02 | 1 | -3/+8 |
* | | | | merge | Sergei Golubchik | 2014-02-04 | 6 | -54/+83 |
|\ \ \ \ | |||||
| * \ \ \ | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 6 | -46/+82 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 6 | -49/+85 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 3 | -41/+74 |
| | | |\ \ | |||||
| | | | * | | Bug#17513737 INTRODUCE CHECK TABLE...QUICK | Anil Toshniwal | 2013-10-17 | 2 | -46/+70 |
| | | | * | | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7 | Ashish Agarwal | 2013-07-02 | 2 | -1/+9 |
| | | * | | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 2 | -1/+3 |
| * | | | | | MySQL WL#5522 - InnoDB transportable tablespaces. | Sergei Golubchik | 2014-02-02 | 1 | -5/+0 |
| * | | | | | MDEV-5574 Set AUTO_INCREMENT below max value of column. | Sergei Golubchik | 2014-02-01 | 1 | -3/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Removing "#include <sys/timeb.h>" from my_global.h, | Alexander Barkov | 2014-02-04 | 1 | -3/+0 |
|/ / / / | |||||
* | | | | remove a deprecated API function from the plugin.h | Sergei Golubchik | 2013-12-22 | 4 | -15/+0 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-12-15 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed compiler errors and warnings | Michael Widenius | 2013-12-02 | 1 | -1/+1 |
* | | | | Do the partial merge of WL#5602 correctly: | Sergei Golubchik | 2013-12-09 | 5 | -49/+3 |
* | | | | MDEV-4243 [PATCH] Warnings/errors while compiling with clang | Sergei Golubchik | 2013-11-28 | 1 | -56/+59 |
* | | | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1 | Sergei Golubchik | 2013-11-28 | 2 | -10/+12 |
* | | | | MroongaSE: addint thd_autoinc and thd_error_context plugin services | Alexander Barkov | 2013-12-12 | 8 | -8/+233 |
* | | | | Fixing an MSVC warning about double "const" data type qualifier | Alexander Barkov | 2013-12-05 | 1 | -1/+1 |
* | | | | merge 10-base->10.0 | unknown | 2013-11-11 | 2 | -0/+81 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 5.5 -> 10.0-base | Alexander Barkov | 2013-11-08 | 2 | -0/+81 |
| |\ \ \ | | |/ / | |||||
| | * | | Added usage of handler error names to mysqltest | Michael Widenius | 2013-11-05 | 2 | -0/+81 |
* | | | | MDEV-5241: Collation incompatibilities with MySQL-5.6 | Michael Widenius | 2013-11-09 | 2 | -0/+31 |
* | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 4 | -0/+38 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MDEV-4506: Parallel replication into 10.0-base. | unknown | 2013-11-01 | 4 | -0/+38 |
| |\ \ \ | |||||
| | * | | | MDEV-4506: Parallel replication: error handling. | unknown | 2013-10-14 | 4 | -4/+4 |
| | * | | | MDEV-4506: Parallel replication. Intermediate commit. | unknown | 2013-06-26 | 4 | -0/+38 |
* | | | | | A few minor Unicode collation customization improvements were made, | Alexander Barkov | 2013-10-31 | 1 | -2/+14 |
* | | | | | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 2 | -3/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | post-review changes | Sergei Golubchik | 2013-10-18 | 1 | -1/+1 |
| * | | | | support DEFINER=role and DEFINER=current_role | Sergei Golubchik | 2013-10-18 | 1 | -3/+3 |
| * | | | | Free some memory leaks | Vicențiu Ciorbaru | 2013-10-17 | 1 | -0/+1 |
| * | | | | Added a delete_function for DYNAMIC_ARRAY. | Vicențiu Ciorbaru | 2013-10-17 | 1 | -0/+3 |
| * | | | | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-09-26 | 1 | -59/+56 |
* | | | | | MDEV-5180 Data type for WEIGHT_STRING is too short in some cases | Alexander Barkov | 2013-10-25 | 1 | -0/+2 |
* | | | | | MDEV-5084: Missing C++ support in ma_dyncol.h | unknown | 2013-10-07 | 1 | -0/+6 |
* | | | | | MDEV-5085: Dynamic columns require inclusion of my_sys.h and my_global.h | unknown | 2013-10-07 | 1 | -0/+18 |
* | | | | | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6 | Alexander Barkov | 2013-10-23 | 1 | -8/+23 |
* | | | | | Client attributes | unknown | 2013-10-03 | 5 | -1/+10 |
* | | | | | MDEV-4928 Merge collation customization improvements | Alexander Barkov | 2013-10-02 | 4 | -28/+114 |
* | | | | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6 | Alexander Barkov | 2013-09-23 | 1 | -1/+14 |
* | | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 11 | -5/+209 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 11 | -5/+209 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax error... | Sergei Golubchik | 2013-09-09 | 1 | -1/+1 |
| | * | | | MDEV-4472 Audit-plugin. Server-related part of the task. | Alexey Botchkov | 2013-09-09 | 8 | -1/+185 |