summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.0.14 into 10.1Sergei Golubchik2014-10-157-127/+108
|\
| * 5.5 mergeSergei Golubchik2014-09-182-7/+20
| |\
| | * support statically linked jemalloc. use that for release buildsSergei Golubchik2014-09-182-6/+17
| | |
| * | 5.5 mergeSergei Golubchik2014-09-163-92/+48
| |\ \ | | |/
| | * MDEV-6613 build system endianness test fails for ppc64le (i.e. Ubuntu)Sergei Golubchik2014-09-122-53/+12
| | | | | | | | | | | | | | | * remove bundled jemalloc, use the system one * force jemalloc in release builds on linux
| | * MDEV-6561 libedit detection is brokenSergei Golubchik2014-09-092-38/+36
| | | | | | | | | | | | | | | | | | | | | | | | fix readline/libedit detection: * search in readline/, editline/ and edit/readline/ * fix typos CMAKE_REQUIRES_LIBRARIES -> CMAKE_REQUIRED_LIBRARIES * use correct libedit API * use different cmake variables for libedit and readline
| * | mergeSergei Golubchik2014-08-083-32/+44
| |\ \
| | * \ 5.5.39 mergeSergei Golubchik2014-08-073-32/+44
| | |\ \ | | | |/
| | | * mysql-5.5.39 mergeSergei Golubchik2014-08-023-32/+44
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ~40% bugfixed(*) applied ~40$ bugfixed reverted (incorrect or we're not buggy) ~20% bugfixed applied, despite us being not buggy (*) only changes in the server code, e.g. not cmakefiles
| | | | * Backport from trunk:Tor Didriksen2014-05-072-15/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#18187290 ISSUE WITH BUILDING MYSQL USING CMAKE 2.8.12 We want to upgrade to VS2013 on Windows. In order to do this, we need to upgrade to cmake 2.8.12 This has introduced some incompatibilities for .pdb files, and "make install" no longer works. To reproduce: cmake --build . --target package --config debug The fix: Rather than installing .pdb files for static libraries, we use the /Z7 flag to store symbolic debugging information in the .obj files.
| | | | * Backport from trunk:Tor Didriksen2014-05-051-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Bug #18593044 COMPILE FLAGS NOT PASSED TO DTRACE, BREAKS CROSS BUILD
| * | | | MDEV-6118: Unable to install "MariaDB-connect-engine" whenNirbhay Choubey2014-08-061-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using "MariaDB-Galera-server" rpm: Updated components' requires-list to include "MariaDB" instead of "MariaDB-server". deb: Added (ORed) 'mariadb-galera-server-10.0' to the 'Depends' list of connect and oqgraph engine packages.
* | | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-configSergei Golubchik2014-10-112-3/+80
| | | |
* | | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-113-23/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove: * NDB from everywhere * IM from mtr-v1 * packaging/rpm-oel and packaging/rpm-uln * few unused spec files * plug.in file * .bzrignore
* | | | portability: use getifaddrs()Sergei Golubchik2014-10-011-0/+1
| | | | | | | | | | | | | | | | instead of exec'ing /usr/sbin/ifconfig|grep|sed|awk
* | | | cleanup: galera merge, simple changesSergei Golubchik2014-10-013-51/+24
| | | |
* | | | bugfix: disabling partitioning in already built treeSergei Golubchik2014-10-011-2/+1
| | | | | | | | | | | | | | | | | | | | that didn't quite work, WITH_PARTITION_STORAGE_ENGINE was not undefined
* | | | cleanup: remove libedit, move readline to extra/Sergei Golubchik2014-10-011-2/+2
| | | |
* | | | wsrep-related changes: removed some unnecessary files & minor modifications.Nirbhay Choubey2014-09-251-4/+1
| | | |
* | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-273-5/+100
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged lp:maria/maria-10.0-galera up to revision 3880. Added a new functions to handler API to forcefully abort_transaction, producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These were added for future possiblity to add more storage engines that could use galera replication.
| * | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-263-5/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged lp:maria/maria-10.0-galera up to revision 3879. Added a new functions to handler API to forcefully abort_transaction, producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These were added for future possiblity to add more storage engines that could use galera replication.
* | | | | Changes for using build scriptsMonty2014-08-091-1/+1
|/ / / / | | | | | | | | | | | | | | | | Removed -DSECURITY_HARDENED=OFF for debug build scripts ignore configure
* | | | MDEV-6354: Implement a way to read MySQL 5.7.4-labs-tplc pageJan Lindström2014-07-222-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | compression format (Fusion-IO). Addeed LZMA and BZIP2 compression methods.
* | | | cmake cleanup: use MY_CHECK_AND_SET_COMPILER_FLAG.Sergei Golubchik2014-06-263-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | move MY_CHECK_C_COMPILER_FLAG and MY_CHECK_CXX_COMPILER_FLAG to a separate file, introduce MY_CHECK_AND_SET_COMPILER_FLAG, use it where possible.
* | | | cmake: prefer INSTALL(PROGRAMS over INSTALL(FILESSergei Golubchik2014-06-261-7/+1
| | | |
* | | | Merge branch '10.1' of github.com:MariaDB/server into 10.1Jan Lindström2014-06-254-89/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: storage/xtradb/handler/ha_innodb.cc
| * | | | MDEV-6248 GUI-friendly cmake options to enable/disable pluginsSergei Golubchik2014-06-232-87/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce a set of PLUGIN_xxx cmake options with values NO, STATIC, DYNAMIC, AUTO, YES (abort if plugin is not compiled) * Deprecate redundant and ambiguous WITH_xxx, WITH_PLUGIN_xxx, WITH_xxx_STORAGE_ENGINE, WITHOUT_xxx, WITHOUT_PLUGIN_xxx, WITHOUT_xxx_STORAGE_ENGINE * Actually check whether a plugin is disabled (DISABLED keyword was always present, but it was ignored until now). * Support conditionally disabled plugins - keyword ONLY_IF * Use ONLY_IF for conditionally skipping plugins, instead of doing MYSQL_ADD_PLUGIN conditionally as before. Because if MYSQL_ADD_PLUGIN isn't done at all, PLUGIN_xxx=YES cannot work.
| * | | | cmake GUI cleanupSergei Golubchik2014-06-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mark path-related variables (AIO_LIBRARY, ODBC_LIBRARY, ODBC_INCLUDE_DIR, Thrift_LIBS, Thrift_INCLUDE_DIRS, CRYPTO_LIBRARY, OPENSSL_LIBRARIES, OPENSSL_ROOT_DIR, OPENSSL_INCLUDE_DIR) as advanced - paths are automatically discovered by cmake. mark few choice variables (ENABLED_LOCAL_INFILE, WITHOUT_SERVER, DISABLE_SHARED) as not advanced - they are user choices, not automatically configured values. remove unused BACKUP_TEST variable.
| * | | | Fix CMakeLists.txt for cmake Ninja generatorSergei Golubchik2014-06-202-2/+2
| | | | |
* | | | | MDEV-6361: innodb_compression_algorithm configuration variable canJan Lindström2014-06-251-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | be set to unsupported value. MDEV-6350: Excessive unnecessary memory allocation at InnoDB/XtraDB startup if LZO is installed.
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2014-06-131-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt VERSION Modified: .gitignore
| * | | 5.5.38 mergeSergei Golubchik2014-06-061-1/+2
| |\ \ \ | | |/ /
| | * | cmake: mark AIO_LIBRARY, EVENT_LIBRARY, GROFF, NROFF as advanced;Sergei Golubchik2014-06-031-1/+2
| | | | | | | | | | | | | | | | use -ggdb3 if supported
* | | | Merge remote-tracking branch 'origin/10.1' into 10.1-serg-mergeSergei Golubchik2014-05-261-5/+5
|\ \ \ \
| * \ \ \ merge the compilation fixes from 10.0-FusionIOSergei Golubchik2014-05-261-5/+5
| |\ \ \ \
| | * | | | temporarily disable lzo compressionSergei Golubchik2014-05-261-4/+4
| | | | | |
| | * | | | lzo.cmake: don't use the same symbol for two different testsSergei Golubchik2014-05-261-2/+2
| | | | | |
* | | | | | Merge branch '10.1' of bzr::/usr/home/serg/Abk/mysql into 10.1Sergei Golubchik2014-05-255-11/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.0 -> 10.1Jan Lindström2014-05-245-11/+18
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | 5.5 mergeSergei Golubchik2014-05-095-11/+18
| | |\ \ \ | | | |/ /
| | | * | MDEV-5081 - Simple performance improvement for MariaDBSergey Vojtovich2014-02-281-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Currently fast mutexes have lower throuput compared to normal mutexes. Remove them from release build configuration.
| | | * | don't install mysql-test/var and cmake internal filesSergei Golubchik2014-04-141-2/+4
| | | | |
| | | * | MDEV-6004 MariaDB init script fails to start (missing dependency on ↵Sergei Golubchik2014-04-081-3/+7
| | | | | | | | | | | | | | | | | | | | MariaDB-client in server RPM)
| | | * | line endingsSergei Golubchik2014-04-081-8/+8
| | | | |
| | | * | MDEV-6016 Packaging error with cmake 2.8.12 and greaterElena Stepanova2014-04-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid CPack complaints when a pdb file is missing for a static library (patch from Vladislav Vaintroub)
| | | * | mysql-5.5.37 selective mergeSergei Golubchik2014-03-272-2/+2
| | | |\ \ | | | | |/
| | | | * Bug#18235669 MYSQL_CONFIG TO PROVIDE R FLAG ON SOLARISTor Didriksen2014-02-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'mysql_config --libs' outputs -L/path/to/library on SunOS we also want it to output '-R/path/to/library' in order to find libraries at runtime. cmake/libutils.cmake: Add an informational message, to show dependencies on OS libraries.
| | | | * Backport of Bug#16809055 MYSQL 5.6 AND 5.7 STILL USE LIBMYSQLCLIENT.SO.18Tor Didriksen2014-01-232-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported only the softlink part of the patch, *not* the bumping of library version. With this patch, the libmysql/ directory contains: libmysqlclient.a libmysqlclient_r.a -> libmysqlclient.a libmysqlclient_r.so -> libmysqlclient.so* libmysqlclient_r.so.18 -> libmysqlclient.so.18* libmysqlclient_r.so.18.0.0 -> libmysqlclient.so.18.0.0* libmysqlclient.so -> libmysqlclient.so.18* libmysqlclient.so.18 -> libmysqlclient.so.18.0.0* libmysqlclient.so.18.0.0*
* | | | | git support in cmake filesSergei Golubchik2014-05-243-5/+34
| | | | |
* | | | | remove support for per-plugin bzr repositoriesSergei Golubchik2014-05-242-24/+0
|/ / / / | | | | | | | | | | | | we don't have closed-source plugins
View Lorry Controller Status