Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert revision sergii@pisem.net-20130123151853-xc6i3l11aqv0iykk | Sergei Golubchik | 2014-03-26 | 1 | -2/+3 |
* | 5.5 merge | Sergei Golubchik | 2014-03-26 | 1 | -8/+8 |
|\ | |||||
| * | MDEV-5905: Creating tmp. memory table kills the server | Michael Widenius | 2014-03-26 | 1 | -8/+8 |
| * | MDEV-5822 TokuDB fails to compile without partition storage engine | Sergei Golubchik | 2014-03-24 | 1 | -0/+6 |
* | | MDEV-5404 Can't free data returned by mariadb_dyncol_unpack on windows | Sergei Golubchik | 2014-03-19 | 1 | -0/+3 |
* | | MDEV-5914: Parallel replication deadlock due to InnoDB lock conflicts | unknown | 2014-03-21 | 4 | -0/+4 |
* | | Merge with 10.0-base | Michael Widenius | 2014-03-13 | 1 | -0/+10 |
|\ \ | |||||
* | | | Fixed some failing tests | Michael Widenius | 2014-03-12 | 1 | -1/+1 |
* | | | MDEV-5766 - my_atomic_load does memory writes | Sergey Vojtovich | 2014-03-07 | 1 | -0/+6 |
* | | | Fixed MDEV-5780 "create-big fails in 10.0" | Michael Widenius | 2014-03-10 | 1 | -2/+2 |
* | | | MDEV-5372 Make "CAST(time_expr AS DATETIME)" compatible with MySQL-5.6 (and t... | Alexander Barkov | 2014-03-07 | 1 | -0/+3 |
* | | | MDEV-5675 - Performance: my_hash_sort_bin is called too often | Sergey Vojtovich | 2014-03-06 | 1 | -2/+7 |
* | | | merge | Sergei Golubchik | 2014-02-28 | 10 | -28/+16 |
|\ \ \ | |||||
| * \ \ | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 10 | -27/+16 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.5 merge | Sergei Golubchik | 2014-02-25 | 10 | -25/+14 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-5613 m_string.h exports generic function names without a namespace prefi... | Sergei Golubchik | 2014-02-17 | 1 | -5/+1 |
| | | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 9 | -20/+13 |
| | | |\ | |||||
| | | | * | Updating the current copyright year in the welcome message for MySQL. | Murthy Narkedimilli | 2014-01-08 | 1 | -2/+2 |
| | | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 5 | -5/+5 |
| | | | * | Bug#17702677 WRONG INSTRUMENTATION INTERFACE FOR MYSQL_COND_TIMEDWAIT | Christopher Powers | 2013-11-07 | 1 | -2/+2 |
| | | | * | Bug#17702677 WRONG INSTRUMENTATION INTERFACE FOR MYSQL_COND_TIMEDWAIT | Marc Alff | 2013-11-06 | 1 | -2/+2 |
* | | | | | Fixing AIX compilation failires | Alexander Barkov | 2014-02-27 | 1 | -0/+33 |
|/ / / / | |||||
* | | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 4 | -11/+11 |
* | | | | 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 |