summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Added support for LZO compression method.Jan Lindström2014-04-152-12/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed: innodb_use_lz4 configuration parameter Added: innodb_compression_algorithm configuration parameter 0 = no compression, 1 = ZLIB, 2 = LZ4, 3 = LZO Fixed issue with incorrect trim calculations
* | | | Additional merge to lp:maria/10.0Jan Lindström2014-03-043-3/+18
|\ \ \ \ | |/ / /
| * | | MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-043-3/+18
| | | |
* | | | Merge: lp:maria/10.0 latest.Jan Lindström2014-03-038-122/+215
|\ \ \ \ | |/ / /
| * | | MDEV-4447 MariaDB sources should have unix-style line endings everywhereSergei Golubchik2014-02-272-86/+86
| | | |
| * | | 10.0-base mergeSergei Golubchik2014-02-264-32/+120
| |\ \ \
| | * \ \ 5.5 mergeSergei Golubchik2014-02-254-32/+120
| | |\ \ \ | | | |/ /
| | | * | MDEV-5390 doesn't install on fedora if mysql is installed, part 2Sergei Golubchik2014-02-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On fedora: 1. provide/obsoleve mariadb-* packages 2. MariaDB-common conflicts with mariadb-libs (on filesystem level), but does not provide or obsolete it.
| | | * | RPM:Sergei Golubchik2014-02-192-32/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * readability fixes * CPackRPM wrapper to fix property leakage between components (cmake bug 13248)
| | | * | RPM: fix alternative provides/obsoletes - put the correct architecture and ↵Sergei Golubchik2014-02-171-6/+11
| | | | | | | | | | | | | | | | | | | | version
| | | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-171-2/+1
| | | |\ \ | | | | |/ | | | | | | | | | | (without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
| | | | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-2/+1
| | | | |
| | | * | Do not include .result~ files and such into packagesElena Stepanova2014-02-101-0/+1
| | | | |
| * | | | Automatic mergeMichael Widenius2014-02-051-0/+2
| |\ \ \ \
| | * | | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added MALLOC_LIBRARY variable to hold name of malloc library - Back ported valgrind related fixes from jemalloc 3.4.1 to the included jemalloc 3.3.1 - Renamed bitmap_init() and bitmap_free() to my_bitmap_init() and my_bitmap_free() to avoid clash with jemalloc 3.4.1 - Use option --soname-synonyms=somalloc=NON to valgrind when using jemalloc - Show version related variables in mysqld --help -- Added SHOW_VALUE_IN_HELP marker Increased back_log to 150 as the original value was a bit too small CMakeLists.txt: Added MALLOC_LIBRARY variable to hold name of malloc library cmake/jemalloc.cmake: Added MALLOC_LIBRARY variable to hold name of malloc library config.h.cmake: Added MALLOC_LIBRARY variable to hold name of malloc library extra/jemalloc/ChangeLog: Updates changelog extra/jemalloc/include/jemalloc/internal/arena.h: Backported valgrind fixes from jemalloc 3.4.1 extra/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in: Backported valgrind fixes from jemalloc 3.4.1 extra/jemalloc/include/jemalloc/internal/private_namespace.h: Backported valgrind fixes from jemalloc 3.4.1 extra/jemalloc/include/jemalloc/internal/tcache.h: Backported valgrind fixes from jemalloc 3.4.1 extra/jemalloc/src/arena.c: Backported valgrind fixes from jemalloc 3.4.1 include/my_bitmap.h: Renamed bitmap_init() and bitmap_free() to my_bitmap_init() and my_bitmap_free() to avoid clash with jemalloc 3.4.1 mysql-test/mysql-test-run.pl: Use option --soname-synonyms=somalloc=NON to valgrind when using jemalloc mysql-test/valgrind.supp: Supression of memory leak in OpenSuse 12.3 mysys/my_bitmap.c: Renamed bitmap_init() and bitmap_free() to my_bitmap_init() and my_bitmap_free() sql/ha_ndbcluster_binlog.cc: Renames sql/ha_ndbcluster_cond.h: Renames sql/ha_partition.cc: Renames sql/handler.cc: Renames sql/item_subselect.cc: Renames sql/log_event.cc: Renames sql/log_event_old.cc: Renames sql/mysqld.cc: Renames Show version related variables in mysqld --help sql/opt_range.cc: Renames sql/opt_table_elimination.cc: Renames sql/partition_info.cc: Renames sql/rpl_injector.h: Renames sql/set_var.h: Renames sql/slave.cc: Renames sql/sql_bitmap.h: Renames sql/sql_insert.cc: Renames sql/sql_lex.h: Renames sql/sql_parse.cc: Renames sql/sql_partition.cc: Renames sql/sql_select.cc: Renames sql/sql_show.cc: Renames sql/sql_update.cc: Renames sql/sys_vars.cc: Show version related variables in mysqld --help sql/sys_vars.h: Added SHOW_VALUE_IN_HELP marker for variables that should be shown in --help sql/table.cc: Renames sql/table.h: Removed not used bitmap_init_value storage/connect/ha_connect.cc: Removed compiler warning storage/maria/ma_open.c: Renames unittest/mysys/bitmap-t.c: Renames
| * | | | | 10.0-base mergeSergei Golubchik2014-02-032-4/+7
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
View Lorry Controller Status