Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.5' into bb-10.6-release | Oleksandr Byelkin | 2022-08-03 | 1 | -1/+3 |
|\ | |||||
| * | Merge branch 'merge-perfschema-5.7' into 10.5 | Oleksandr Byelkin | 2022-08-02 | 1 | -1/+3 |
| |\ | |||||
| | * | mysql-5.7.39 | Oleksandr Byelkin | 2022-07-29 | 1 | -1/+3 |
* | | | Merge branch '10.5' into 10.6 | Oleksandr Byelkin | 2022-02-03 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-perfschema-5.7' into 10.5 | Oleksandr Byelkin | 2022-01-28 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | 5.7.37 | Oleksandr Byelkin | 2022-01-25 | 1 | -2/+1 |
| | * | 5.7.34 | Sergei Golubchik | 2021-05-03 | 1 | -1/+1 |
| | * | 5.7.28 | Sergei Golubchik | 2019-12-11 | 1 | -5/+11 |
| | * | 5.7.13 | Sergei Golubchik | 2016-07-28 | 1 | -3/+129 |
* | | | Merge 10.5 to 10.6 | Marko Mäkelä | 2021-08-19 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.4 into 10.5 | Marko Mäkelä | 2021-08-18 | 1 | -2/+1 |
| |\ \ | |||||
| | * | | cleanup: specifying plugin dependencies in CMakeLists.txt | Sergei Golubchik | 2021-08-03 | 1 | -2/+3 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2021-06-01 | 1 | -0/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | perfschema: use glibc gettid if available | Daniel Black | 2021-06-01 | 1 | -0/+3 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2021-05-07 | 1 | -2/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch bb-10.4-release into bb-10.5-releasemariadb-10.5.10 | Nikita Malyavin | 2021-05-05 | 1 | -2/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-25543: Building failure on MacOS in case MariadDB server is compiled wit...bb-10.2-MDEV-25543 | Dmitry Shulga | 2021-04-28 | 1 | -2/+1 |
* | | | | MDEV-20220: Merge 5.7 P_S replication table 'replication_applier_status_by_wo... | Sujatha | 2021-04-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | Add build on AIX | Etienne Guesnet | 2020-12-16 | 1 | -0/+5 |
* | | | MDEV-23091: perfschema Add support for OpenBSD's getthrid() to retrieve the t... | Brad Smith | 2020-08-28 | 1 | -0/+10 |
* | | | perfschema compilation, test and misc fixes | Sergei Golubchik | 2020-03-10 | 1 | -4/+55 |
* | | | P_S 5.7.28 | Sergei Golubchik | 2020-03-10 | 1 | -0/+123 |
|/ / | |||||
* | | Merge branch 'merge-perfschema-5.6' into 10.1 | Oleksandr Byelkin | 2020-01-19 | 1 | -4/+11 |
|\ \ | |||||
| * | | 5.6.47 | Oleksandr Byelkin | 2020-01-19 | 1 | -6/+12 |
| |/ | |||||
* | | 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 |