Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
|\ | |||||
| * | Follow-up to changing FSF address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | after-merge: 10.0 part of MDEV-9249 (ERR_remove_state) | Sergei Golubchik | 2015-12-21 | 1 | -1/+1 |
* | | | fix cmake dependencies | Sergei Golubchik | 2015-06-02 | 1 | -3/+6 |
* | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -21/+1 |
|\ \ \ | |/ / | |||||
| * | | perfschema 5.6.24 | Sergei Golubchik | 2015-05-05 | 1 | -21/+1 |
| |\ \ | |||||
| | * | | 5.6.24 | Sergei Golubchik | 2015-05-04 | 1 | -19/+1 |
| | * | | perfschema 5.6.10 initial commit. | Sergei Golubchik | 2014-05-06 | 1 | -0/+207 |
| | / | |||||
* | | | MDEV-7437 remove suport for "atomics" with rwlocks | Sergei Golubchik | 2015-01-13 | 1 | -1/+0 |
* | | | fix out-of-source builds | Sergei Golubchik | 2014-12-04 | 1 | -0/+1 |
* | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -3/+5 |
|\ \ \ | |/ / | |||||
| * | | MDEV-6579: Properly handle gen_pfs_lex_token when cross-compiling | James Le Cuirot | 2014-08-15 | 1 | -3/+5 |
* | | | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -4/+0 |
* | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-27 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+4 |
| |/ / | |||||
* | | | MDEV-4262 - P_S discovery | Sergey Vojtovich | 2014-08-19 | 1 | -1/+0 |
|/ / | |||||
* | | MDEV-5620 CMake option to compile against an external PCRE library | Sergei Golubchik | 2014-03-04 | 1 | -2/+1 |
* | | Merge 10.0-base -> 10.0 | Alexander Barkov | 2013-10-15 | 1 | -1/+2 |
|\ \ | |||||
| * | | A follow-up for the previous commit: | Alexander Barkov | 2013-10-02 | 1 | -0/+1 |
| * | | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-09-26 | 1 | -1/+1 |
| |/ | |||||
* | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -0/+9 |
* | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | MDEV-672 : storage/maria and storage/perfschema do not appear to honor WITH_U... | Vladislav Vaintroub | 2012-10-30 | 1 | -1/+1 |
* | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -51/+169 |
|/ | |||||
* | unit test fixes for ctest | Sergei Golubchik | 2011-07-16 | 1 | -2/+1 |
* | Bug#55416 Renaming of performance_schema tables for 5.5 | Marc Alff | 2010-08-12 | 1 | -4/+4 |
* | Fixed Copyright headers in storage/perfschema | Marc Alff | 2010-07-15 | 1 | -4/+3 |
* | Cleanup casing in MYSQL_ADD_PLUGIN, patch provided by Kent | Vladislav Vaintroub | 2010-02-01 | 1 | -1/+1 |
* | Post-merge fixes , define HAVE_RWLOCK_T on Solaris define | Vladislav Vaintroub | 2010-01-14 | 1 | -0/+4 |
* | merge | Vladislav Vaintroub | 2010-01-14 | 1 | -3/+1 |
* | WL#2360 Performance schema | Marc Alff | 2010-01-11 | 1 | -0/+79 |