Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't build aws_key_management plugin by default | Sergei Golubchik | 2019-02-19 | 1 | -1/+1 |
* | 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 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Don't default to bundled zlib | Sergei Golubchik | 2018-12-17 | 1 | -5/+0 |
* | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-31 | 1 | -10/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-10-31 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | don't try to build with OpenSSL 1.1+ | Sergei Golubchik | 2018-10-30 | 1 | -1/+2 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 4 | -21/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-10-27 | 4 | -21/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | / / / / / / / / / / / | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-10-23 | 2 | -14/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Bug#28200422 USE CTAGS RATHER THAN ETAGS FOR GENERATING TAGS FILE | Tor Didriksen | 2018-07-19 | 1 | -9/+26 |
| | | * | | | | | | | | | | | | Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIES | Aditya A | 2018-07-09 | 2 | -15/+6 |
| | * | | | | | | | | | | | | | Fix cmake warning | Vladislav Vaintroub | 2018-10-10 | 1 | -3/+2 |
| | * | | | | | | | | | | | | | cmake: fix usage of GET_TARGET_PROPERTY | Sergei Golubchik | 2018-09-22 | 1 | -4/+8 |
* | | | | | | | | | | | | | | | Restore auto-switch to bundled ssl if WITH_SSL=yes | Sergei Golubchik | 2018-10-29 | 1 | -2/+1 |
* | | | | | | | | | | | | | | | rpm fixes: more %ignore'd files | Sergei Golubchik | 2018-10-28 | 1 | -0/+3 |
* | | | | | | | | | | | | | | | Merge branch '10.0' into bb-10.1-merge-sanja | Oleksandr Byelkin | 2018-07-25 | 2 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helper | Sergei Golubchik | 2018-07-19 | 2 | -0/+11 |
* | | | | | | | | | | | | | | | Merge branch '10.0' into bb-10.1-mergebb-10.1-merge-sanja | Oleksandr Byelkin | 2018-07-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | MDEV-16596 : Windows - redo log does not work on native 4K sector disks. | Vladislav Vaintroub | 2018-07-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Adopt Debian's fix-FTBFS-on-GNU-Hurd.patch. | Sergei Petrunia | 2018-06-29 | 2 | -0/+7 |
* | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-06-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-06-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / |