Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -8/+9 |
|\ | |||||
| * | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 1 | -8/+9 |
| |\ | |||||
| | * | Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTION | Tor Didriksen | 2014-01-16 | 1 | -11/+9 |
| | * | Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTION | Tor Didriksen | 2014-01-16 | 1 | -9/+12 |
* | | | Merge from maria/5.5 (-rtag:mariadb-5.5.36). | Nirbhay Choubey | 2014-02-25 | 1 | -1/+9 |
|\ \ \ | |/ / | |||||
| * | | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+9 |
| |\ \ | | |/ | |||||
| | * | Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTION | Tor Didriksen | 2013-12-18 | 1 | -0/+9 |
| | * | Backport 5.5.35 EL6 uln repo rpms | Balasubramanian Kandasamy | 2013-11-25 | 1 | -0/+1 |
* | | | Merge of maria/5.5 into maria-5.5-galera. | Nirbhay Choubey | 2014-01-29 | 1 | -0/+81 |
|\ \ \ | |/ / | |||||
| * | | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -0/+75 |
| |\ \ | | |/ | |||||
| | * | Fix for Bug 17584523 - LICENSE AND DOCUMENTATION FILES MISSING FROM WINDOWS M... | Sreedhar.S | 2013-10-16 | 1 | -1/+2 |
| | * | Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE LIBR... | Sreedhar.S | 2013-10-09 | 1 | -20/+0 |
| | * | Fix to copy missing pdb files BUG 13878021 | Sreedhar.S | 2013-09-30 | 1 | -0/+21 |
| | * | Bug#17435338 ADD A -DWITH_ASAN SWITCH/OPTION TO OUR CMAKE SCRIPTS | Tor Didriksen | 2013-09-20 | 1 | -1/+77 |
| * | | set CMP0022 policy to avoid cmake warnings | Sergei Golubchik | 2013-11-20 | 1 | -0/+6 |
* | | | 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 |
|\ \ \ | |/ / | |||||
| * | | MDEV-5038 put tokudb into the server package | Sergei Golubchik | 2013-11-11 | 1 | -0/+6 |
* | | | mariadb-5.5.33 merge | Sergei Golubchik | 2013-09-18 | 1 | -9/+13 |
|\ \ \ | |/ / | |||||
| * | | merge with 5.5-tokudb tree. In particular: | Sergei Golubchik | 2013-09-10 | 1 | -8/+9 |
| |\ \ | |||||
| | * | | INSTALL_DOCUMENTATION function for CMakeLists.txt | Sergei Golubchik | 2013-09-10 | 1 | -8/+6 |
| | * | | start using jemalloc | Sergei Golubchik | 2013-08-30 | 1 | -0/+3 |
| * | | | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Merge from 5.5 to 5.6 | Chaithra Gopalareddy | 2013-05-23 | 1 | -0/+1 |
| | |\ | |||||
| | | * | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 1 | -1/+1 |
| * | | | MDEV-4165 [PATCH] RFE: make tmpdir a build-time configurable option | Sergei Golubchik | 2013-08-17 | 1 | -1/+3 |
* | | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 1 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -2/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug 16534721 - MYSQL_INSTALL_DB RUNS AGAIN DURING UPGRADE EVEN DATA DIRECTORY... | Murthy Narkedimilli | 2013-04-03 | 1 | -1/+2 |
| | * | | Placement change: | Joerg Bruehe | 2012-11-07 | 1 | -1/+1 |
* | | | | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-4458 - Windows installer does not launch upgrade wizard anymore, even if... | Vladislav Vaintroub | 2013-04-30 | 1 | -1/+1 |
* | | | | References: MDEV-4572 - merge with mariaDB 5.5.30 | Seppo Jaakola | 2013-05-24 | 1 | -5/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | make rpm packages to respect CMAKE_INSTALL_PREFIX | Sergei Golubchik | 2013-02-08 | 1 | -5/+1 |
* | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -0/+2 |
| |\ \ \ | |||||
| | * | | | Placement change: | Joerg Bruehe | 2012-11-08 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge changes for ULN RPMs into main 5.5 | Joerg Bruehe | 2012-09-21 | 1 | -0/+1 |
| | |\ \ | |||||
| | | * | | More changes to supporting the build of RPMs for ULN | Joerg Bruehe | 2012-06-11 | 1 | -0/+1 |
| | * | | | Bug#14593123 CONFIGURE.PL WITH CMAKE2.8 BREAKS THE BUILD | Tor Didriksen | 2012-09-07 | 1 | -0/+1 |
* | | | | | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562) | Seppo Jaakola | 2012-10-24 | 1 | -0/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -0/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | upmerge 14035452 5.1 -> 5.5 | Bjorn Munch | 2012-07-19 | 1 | -0/+3 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | |||||
| | | * | Bug #14035452 - MODULARIZE MYSQL_CLIENT_TEST | Bjorn Munch | 2012-07-19 | 1 | -0/+3 |
* | | | | References lp:1051808 - merged with lp:maria/5.5 | Seppo Jaakola | 2012-09-17 | 1 | -9/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-439 cmake -DWITHOUT_SERVER does not work | Sergei Golubchik | 2012-08-23 | 1 | -9/+10 |
* | | | | References lp:1034621 - Merge up to mysql-5.5.25 level | Seppo Jaakola | 2012-08-09 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-302 lp:988204 MariaDB 5.5.23 binaries don't use libaio | Sergei Golubchik | 2012-06-06 | 1 | -0/+4 |
* | | | | references lp:1011983 | Seppo Jaakola | 2012-06-12 | 1 | -49/+26 |
|\ \ \ \ | |/ / / | |||||
| * | | | Building RPMs with CPack | Sergei Golubchik | 2012-05-22 | 1 | -48/+26 |