summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0-galera into 10.1Sergei Golubchik2015-02-061-1/+2
|\
| * maria-10.0.16 mergeNirbhay Choubey2015-01-261-36/+5
| |\
| * | bzr merge -r4123..4144 codership/5.6Nirbhay Choubey2014-09-301-1/+2
| * | bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-4/+9
| |\ \
| * \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-10/+31
| |\ \ \
| * \ \ \ bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-1/+6
| |\ \ \ \
| * \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-10/+13
| |\ \ \ \ \
| * \ \ \ \ \ * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-2/+93
| |\ \ \ \ \ \
| * | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-301-2/+2
| * | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-3/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-16/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge 10.0 to galera-10.0Jan Lindström2013-09-031-4/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-1/+11
* | | | | | | | | | | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-311-35/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | 5.5 mergeSergei Golubchik2015-01-211-36/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | mysql-5.5.41 mergeSergei Golubchik2014-12-191-30/+4
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Added sles11 repo packagesmysql-5.5.41Balasubramanian Kandasamy2014-11-041-0/+1
| | | * | | | | | | | | | Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANGJon Olav Hauglid2014-10-131-39/+53
| | * | | | | | | | | | | remove mariadb.pc file again, it cannot be added in a GA versionmariadb-5.5.40Sergei Golubchik2014-10-081-8/+2
| | * | | | | | | | | | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-configSergei Golubchik2014-10-021-2/+8
* | | | | | | | | | | | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-10/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | 5.5 mergeSergei Golubchik2014-09-161-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | MDEV-6526 INFO_SRC and INFO_BIN installed wrongSergei Golubchik2014-09-121-2/+5
| * | | | | | | | | | | | MDEV-6565 search order for my.cnf inconsistent in docs/use, and global overri...Sergei Golubchik2014-09-101-1/+1
| * | | | | | | | | | | | MDEV-6579: Properly handle gen_pfs_lex_token when cross-compilingJames Le Cuirot2014-08-151-1/+1
| * | | | | | | | | | | | MDEV-6562: Fix WITHOUT_SERVER buildJames Le Cuirot2014-08-111-1/+4
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | 5.5.39 mergeSergei Golubchik2014-08-071-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | mysql-5.5.39 mergeSergei Golubchik2014-08-021-1/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Bug#19001781: ADD SUPPORT FOR CMAKE 3Jon Olav Hauglid2014-06-241-0/+8
| | | * | | | | | | | | Bug#18972488 Remove packaging/rpm-uln directory from source - Updated CMakeLi...Balasubramanian Kandasamy2014-06-171-1/+0
| | | * | | | | | | | | Backport of:Tor Didriksen2014-03-051-0/+6
| * | | | | | | | | | | typo fixed: only use -ggdb3 when it's supported by the compilerSergei Golubchik2014-08-061-2/+4
| * | | | | | | | | | | typo in CMakeLists.txt that caused USE_MYSYS_NEW to be set too early and inco...Sergei Golubchik2014-07-081-7/+7
| * | | | | | | | | | | MDEV-6410 Cross-compile fixesSergei Golubchik2014-07-081-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | MySQL Bug #61340: Use CMake EXPORT feature to aid cross-compiling.James Le Cuirot2014-04-271-0/+10
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
* | | | | | | | | | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-configSergei Golubchik2014-10-111-2/+8
* | | | | | | | | | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-111-6/+0
* | | | | | | | | | | don't enable SECURITY_HARDENED on old gccSergei Golubchik2014-10-011-1/+6
* | | | | | | | | | | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-3/+4
* | | | | | | | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+11
* | | | | | | | | | | MDEV-5730 enhance security using special compilation optionsSergei Golubchik2014-06-261-0/+2
* | | | | | | | | | | MDEV-5730 enhance security using special compilation optionsSergei Golubchik2014-06-261-0/+14
* | | | | | | | | | | cmake cleanup: use MY_CHECK_AND_SET_COMPILER_FLAG.Sergei Golubchik2014-06-261-65/+10
* | | | | | | | | | | cmake GUI cleanupSergei Golubchik2014-06-231-5/+2
* | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2014-06-131-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | 5.5.38 mergeSergei Golubchik2014-06-061-1/+6
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | cmake: mark AIO_LIBRARY, EVENT_LIBRARY, GROFF, NROFF as advanced;Sergei Golubchik2014-06-031-0/+5
| | * | | | | | | | MDEV-5645 MariaDB-5.5.35 - references are made to an "EXCEPTIONS-CLIENT" file...Sergei Golubchik2014-05-311-1/+1
* | | | | | | | | | set version to 10.1.0Sergei Golubchik2014-05-251-2/+2
View Lorry Controller Status