Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-10-30 | 1 | -1/+1 |
|\ | |||||
| * | Merge tag 'mariadb-5.5.62' into 5.5-galeramariadb-galera-5.5.62 | Jan Lindström | 2018-10-29 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-10-23 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIES | Aditya A | 2018-07-09 | 1 | -1/+7 |
| | | * | Bug #25436469: BUILDS ARE NOT REPRODUCIBLE | Tor Didriksen | 2017-05-16 | 1 | -0/+30 |
| * | | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 1 | -10/+9 |
| |\ \ \ | |||||
| * \ \ \ | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50 | Nirbhay Choubey | 2016-06-23 | 1 | -2/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch '5.5' into 5.5-galera | Nirbhay Choubey | 2015-02-18 | 1 | -2/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge revisions from maria/5.5 (5.5.41) | Nirbhay Choubey | 2014-12-22 | 1 | -30/+4 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | bzr merge -r4015..4026 codership/5.5 | Nirbhay Choubey | 2014-10-09 | 1 | -1/+2 |
| * | | | | | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5 | Nirbhay Choubey | 2014-10-09 | 1 | -2/+5 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Local merge of mariadb-5.5.39 | Nirbhay Choubey | 2014-08-06 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-5.5.38 maria/5.5 | Nirbhay Choubey | 2014-06-10 | 1 | -2/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -8/+9 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge from maria/5.5 (-rtag:mariadb-5.5.36). | Nirbhay Choubey | 2014-02-25 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge of maria/5.5 into maria-5.5-galera. | Nirbhay Choubey | 2014-01-29 | 1 | -0/+81 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | MDEV-5385: Debian MariaDB-Galera packages do not get built in buildbot | Jan Lindström | 2013-12-04 | 1 | -2/+2 |
| * | | | | | | | | | | | | | Merge with MariaDB 5.5.34. | Jan Lindström | 2013-11-25 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | mariadb-5.5.33 merge | Sergei Golubchik | 2013-09-18 | 1 | -9/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References: MDEV-4572 - merge with mariaDB 5.5.30 | Seppo Jaakola | 2013-05-24 | 1 | -5/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562) | Seppo Jaakola | 2012-10-24 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References lp:1051808 - merged with lp:maria/5.5 | Seppo Jaakola | 2012-09-17 | 1 | -9/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References lp:1034621 - Merge up to mysql-5.5.25 level | Seppo Jaakola | 2012-08-09 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | references lp:1011983 | Seppo Jaakola | 2012-06-12 | 1 | -49/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5 | Seppo Jaakola | 2012-04-26 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -1/+12 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.36' into 10.0-galera | Jan Lindström | 2018-08-02 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helper | Sergei Golubchik | 2018-07-19 | 1 | -0/+6 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-06-21 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Revert "MDEV-16075: Workaround to run MTR test suite for make test" | Sergei Golubchik | 2018-06-20 | 1 | -4/+0 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-06-10 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | MDEV-16075: Workaround to run MTR test suite for make test | Teodor Mircea Ionita | 2018-06-10 | 1 | -0/+4 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Build improvements and cleanups. | Vladislav Vaintroub | 2017-09-08 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -10/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -8/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55 | Sergei Golubchik | 2017-04-11 | 1 | -8/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | Bug#18374703 COMPILATION ERROR WITH -DENABLE_DEBUG_SYNC=0 AND -DWITH_DEBUG=ON | Tor Didriksen | 2017-01-17 | 1 | -5/+3 |
| | | * | | | | | | | | | | | | | | | | | | | | | | Bug#18374703 COMPILATION ERROR WITH -DENABLE_DEBUG_SYNC=0 AND -DWITH_DEBUG=ON | Tor Didriksen | 2017-01-17 | 1 | -3/+2 |
| | | * | | | | | | | | | | | | | | | | | | | | | | Bug#21770366 backport bug#21657078 to 5.5 and 5.6 | Ajo Robert | 2016-01-07 | 1 | -4/+11 |
| | | * | | | | | | | | | | | | | | | | | | | | | | Updated CMakeLists.txt to include rpm-docker directory | Balasubramanian Kandasamy | 2015-06-16 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-03-21 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | remove COPYING.LESSER | Sergei Golubchik | 2017-03-21 | 1 | -2/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | MDEV-10788 Not able to compile source with -DBUILD_CONFIG=mysql_release -DCMA... | Sergei Golubchik | 2017-02-27 | 1 | -0/+3 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | Fix warnings on Windows, compiler option -ggdb3 option is nonexistent | Vladislav Vaintroub | 2016-05-24 | 1 | -2/+4 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | |