Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | cmake: re-enable -Werror in the maintainer mode | Sergei Golubchik | 2019-03-27 | 1 | -2/+7 | |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-03-25 | 2 | -4/+6 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | cmake 3.14mariadb-10.2.23 | Sergei Golubchik | 2019-03-23 | 1 | -1/+5 | |
| * | | | MDEV-18954 numa dynamic dependency | Sergei Golubchik | 2019-03-22 | 1 | -0/+1 | |
| * | | | cmake: remove unused variable | Sergei Golubchik | 2019-03-22 | 1 | -3/+0 | |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-03-11 | 2 | -4/+4 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-03-11 | 2 | -2/+2 | |
| |\ \ \ | | |/ / | ||||||
| | * | | MDEV-17703 Add WITH_UBSAN switch to CMake similar to WITH_ASAN | Eugene Kosov | 2019-03-11 | 2 | -2/+2 | |
| | * | | Fix the WITH_ASAN clang build of dynamic plugins | Marko Mäkelä | 2019-03-07 | 1 | -1/+1 | |
* | | | | Merge branch '10.2' into bb-10.3-merge | Oleksandr Byelkin | 2019-02-19 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2019-02-19 | 1 | -1/+1 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Don't build aws_key_management plugin by default | Sergei Golubchik | 2019-02-19 | 1 | -1/+1 | |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-02-19 | 3 | -6/+9 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | typo cmake/submodules.cmake | Laurynas Biveinis | 2019-02-13 | 1 | -1/+1 | |
| * | | | cmake/submodules: notify user about gitconfig for automatic update | Daniel Black | 2019-02-13 | 1 | -4/+8 | |
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-03 | 2 | -6/+0 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge 10.1 into 10.1 | Marko Mäkelä | 2019-02-02 | 2 | -2/+9 | |
| | |\ \ | ||||||
| | | * \ | Merge branch '5.5' into 10.0 | Oleksandr Byelkin | 2019-01-28 | 1 | -1/+0 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | Crude "auto-load-data-local-infile" modemariadb-5.5.63 | Sergei Golubchik | 2019-01-27 | 1 | -1/+0 | |
| | | * | | Merge branch '5.5' into 10.0 | Oleksandr Byelkin | 2019-01-28 | 1 | -1/+10 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | MDEV-17615 cmake ssl error on musl/libressl | Sergei Golubchik | 2019-01-21 | 1 | -1/+9 | |
| * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-02 | 1 | -1/+1 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge branch '10.0-galera' into 10.1 | Oleksandr Byelkin | 2019-01-31 | 1 | -1/+1 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge remote-tracking branch 'origin/10.0' into 10.0-galera | Jan Lindström | 2018-11-02 | 1 | -2/+3 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-10-30 | 5 | -22/+18 | |
| | | |\ \ \ \ | ||||||
| | | | * \ \ \ | Merge tag 'mariadb-5.5.62' into 5.5-galeramariadb-galera-5.5.62 | Jan Lindström | 2018-10-29 | 4 | -21/+17 | |
| | | | |\ \ \ \ | ||||||
| | | | * | | | | | Bump WSREP_PATCH_VERSION | Vasil Dimov | 2018-10-10 | 1 | -1/+1 | |
| | | | * | | | | | Bump wsrep patch version to 25.23 | Teemu Ollakka | 2018-02-25 | 1 | -1/+1 | |
| | | | * | | | | | Merge tag 'mariadb-5.5.59' into 5.5-galera | Jan Lindström | 2018-01-19 | 1 | -0/+1 | |
| | | | |\ \ \ \ \ | ||||||
| | | | * | | | | | | MW-406 Bumped up the wsrep patch version (5.5.57-25.22) | Teemu Ollakka | 2017-10-19 | 1 | -1/+1 | |
| | | | * | | | | | | MW-383 Bumped wsrep patch version | Teemu Ollakka | 2017-07-20 | 1 | -1/+1 | |
| | | | * | | | | | | Merge tag 'mariadb-5.5.57' into 5.5-galera | Jan Lindström | 2017-07-20 | 2 | -4/+10 | |
| | | | |\ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ | Merge tag 'mariadb-5.5.56' into 5.5-galera | Sachin Setiya | 2017-05-03 | 1 | -0/+3 | |
| | | | |\ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 3 | -0/+32 | |
| | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | Bump WSREP_PATCH_VERSION to 20 | Sachin Setiya | 2017-04-18 | 1 | -1/+1 | |
| | | | * | | | | | | | | | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54 | Nirbhay Choubey | 2016-12-27 | 3 | -1/+3 | |
| | | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.49' into 5.5-galera | Nirbhay Choubey | 2016-04-25 | 1 | -0/+3 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.48' into 5.5-galera | Nirbhay Choubey | 2016-02-13 | 4 | -8/+17 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | Update WSREP_PATCH_REVNO. | Nirbhay Choubey | 2016-02-10 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 14 | Philip Stoev | 2016-02-10 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 13 | Philip Stoev | 2016-02-10 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.46' into 5.5-galera | Nirbhay Choubey | 2015-10-13 | 1 | -4/+6 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.36' into 10.0-galera | Jan Lindström | 2018-08-02 | 3 | -1/+12 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | | | Backport BUILD scripts from 10.4 | Monty | 2019-02-06 | 1 | -0/+15 | |
* | | | | | | | | | | | | | | | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-01-03 | 3 | -9/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | fix RHEL8 "ambiguous python shebang" build failures | Sergei Golubchik | 2019-01-03 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2mariadb-10.2.21 | Sergei Golubchik | 2018-12-30 | 1 | -5/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-12-29 | 1 | -5/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-12-20 | 1 | -5/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | / | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | |