summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* Merged from 10.0-FusionIO:Jan Lindström2015-02-191-0/+32
* followup for "MDEV-6248 GUI-friendly cmake options to enable/disable plugins"Sergei Golubchik2015-02-151-7/+12
* cmake-time detection for EVP_aes_128_ctr()Sergei Golubchik2015-02-101-0/+5
* encryption key management plugin apiSergei Golubchik2015-02-101-0/+1
* minor cleanup: ssl.cmakeSergei Golubchik2015-02-101-10/+2
* Merge branch 'bb-10.1-merge' into 10.1Sergei Golubchik2015-02-072-4/+4
|\
| * Merge 10.0-galera into 10.1Sergei Golubchik2015-02-062-4/+4
| |\
| | * maria-10.0.16 mergeNirbhay Choubey2015-01-267-81/+105
| | |\
| | * | MDEV-7470: MariaDB-Galera-server uses 'tar', but 'tar' isNirbhay Choubey2015-01-181-1/+1
| | * | MDEV-7204: mariadb-galera-server el7 rpms packagingNirbhay Choubey2014-12-091-1/+3
| | * | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-053-17/+3
| | |\ \
| | * | | bzr merge -r4123..4144 codership/5.6Nirbhay Choubey2014-09-301-1/+1
| | * | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-283-94/+63
| | |\ \ \
| | * | | | Updated WSREP_PATCH_REVNO.Nirbhay Choubey2014-08-121-2/+2
| | * | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-114-33/+45
| | |\ \ \ \
| | * | | | | bzr merge -r4091..4101 codership/5.6/Nirbhay Choubey2014-06-191-1/+1
| | * | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-1/+2
| | |\ \ \ \ \
| | * | | | | | Added rsync to galera server's rpm dependency list.Nirbhay Choubey2014-05-291-2/+2
| | * | | | | | MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' isNirbhay Choubey2014-05-251-5/+2
| | * | | | | | Merging changes from maria-5.5-galera andNirbhay Choubey2014-05-222-3/+4
| | * | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-215-11/+18
| | |\ \ \ \ \ \
| | * | | | | | | MDEV#5942 (Issue 1), MDEV#5903Nirbhay Choubey2014-05-121-1/+9
| | * | | | | | | Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-272-2/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | * bzr merge -r4027..4061 codership/5.6Nirbhay Choubey2014-03-261-0/+3
| | | * | | | | | | Updated WSREP_PATCH_REVNO.Nirbhay Choubey2014-03-251-1/+1
| | | * | | | | | | bzr merge -r3946..3968 codership/5.5Nirbhay Choubey2014-03-251-1/+1
| | * | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-269-95/+131
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Merging deb/rpm script changes from maria-5.5-galera.Nirbhay Choubey2014-03-241-27/+128
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Fixed install_macros.cmake to set the correctNirbhay Choubey2014-02-191-3/+2
| | * | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-301-16/+21
| | * | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-254-108/+32
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-0410-26/+148
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | bzr merge -r3904..3928 lp:codership-mysql/5.5Seppo Jaakola2013-11-271-1/+1
| | * | | | | | | | | | Merged revisions 3418..3424 from mariadb-galera-5.5Seppo Jaakola2013-10-072-2/+2
| | * | | | | | | | | | Merged revisions 3409..3411 from mariadb-galera-5.5Seppo Jaakola2013-10-062-0/+30
| | * | | | | | | | | | Merged #3909 from mariadb-galera-5.5Seppo Jaakola2013-10-061-0/+59
| | * | | | | | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-0311-56/+404
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-1312-28/+38
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-133-31/+13
* | | | | | | | | | | | | | disable -Werror in the maintainer mode until we're ready for itSergei Golubchik2015-02-061-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | MDEV-6633: Remove magic dependencies for InnoDB compression methodsJan Lindström2015-02-044-43/+85
* | | | | | | | | | | | | compiler warningsSergei Golubchik2015-01-311-1/+1
* | | | | | | | | | | | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-317-81/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | after-merge fixesSergei Golubchik2015-01-211-0/+2
| * | | | | | | | | | | | 5.5 mergeSergei Golubchik2015-01-216-81/+103
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | MDEV-6347 Build RHEL7 packagesSergei Golubchik2015-01-161-0/+1
| | * | | | | | | | | | | Fixed a couple of compiler warnings.Sergey Vojtovich2014-12-191-2/+2
| | * | | | | | | | | | | mysql-5.5.41 mergeSergei Golubchik2014-12-195-81/+102
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANGJon Olav Hauglid2014-10-134-64/+87
| | | * | | | | | | | | | | Bug #18808072 MYSQLBINLOG USES LOCALTIME() TO PRINT EVENTS, CAUSES KERNEL MUT...Venkatesh Duggirala2014-10-081-3/+3
View Lorry Controller Status