mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
88948 commits 2773 branches 343 tags 1.6 GiB
Commit graph

470 commits

Author SHA1 Message Date
Sergei Golubchik
2156f62d2e portability: use getifaddrs() 
instead of exec'ing /usr/sbin/ifconfig|grep|sed|awk
 2014-10-01 23:48:36 +02:00
Sergei Golubchik
3620910eea cleanup: galera merge, simple changes 2014-10-01 23:38:27 +02:00
Sergei Golubchik
b054e4bdb1 bugfix: disabling partitioning in already built tree 
that didn't quite work, WITH_PARTITION_STORAGE_ENGINE
was not undefined
 2014-10-01 23:38:26 +02:00
Sergei Golubchik
88cebbdf6d cleanup: remove libedit, move readline to extra/ 2014-10-01 23:38:26 +02:00
Nirbhay Choubey
236cc6cd49 wsrep-related changes: removed some unnecessary files & minor modifications. 2014-09-25 20:59:15 -04:00
Jan Lindström
ab150128ce MDEV-6247: Merge 10.0-galera to 10.1. 
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.
 2014-08-27 13:15:37 +03:00
Jan Lindström
df4dd593f2 MDEV-6247: Merge 10.0-galera to 10.1. 
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.
 2014-08-26 15:43:46 +03:00
Monty
7375f025ee Changes for using build scripts 
Removed -DSECURITY_HARDENED=OFF for debug build scripts
ignore configure
 2014-08-09 13:22:01 +03:00
Jan Lindström
dbc79ce055 MDEV-6354: Implement a way to read MySQL 5.7.4-labs-tplc page 
compression format (Fusion-IO).

Addeed LZMA and BZIP2 compression methods.
 2014-07-22 06:56:50 +03:00
Sergei Golubchik
6c0e3ef450 cmake cleanup: use MY_CHECK_AND_SET_COMPILER_FLAG. 
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.
 2014-06-26 11:54:13 +02:00
Sergei Golubchik
afa4c36ca0 cmake: prefer INSTALL(PROGRAMS over INSTALL(FILES 2014-06-26 11:54:12 +02:00
Jan Lindström
aa22471633 Merge branch '10.1' of github.com:MariaDB/server into 10.1 
Conflicts:
	storage/xtradb/handler/ha_innodb.cc
 2014-06-25 21:00:24 +03:00
Jan Lindström
3bca01930a MDEV-6361: innodb_compression_algorithm configuration variable can 
be set to unsupported value.

MDEV-6350: Excessive unnecessary memory allocation at InnoDB/XtraDB
startup if LZO is installed.
 2014-06-25 08:46:54 +03:00
Sergei Golubchik
787ec31778 MDEV-6248 GUI-friendly cmake options to enable/disable plugins 
* 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.
 2014-06-23 17:39:13 +02:00
Sergei Golubchik
da9bb66b02 cmake GUI cleanup 
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.
 2014-06-23 17:39:13 +02:00
Sergei Golubchik
fb8818c1af Fix CMakeLists.txt for cmake Ninja generator 2014-06-20 09:03:47 +02:00
Sergei Golubchik
f61f36b386 Merge branch '10.0' into 10.1 
Conflicts:
	CMakeLists.txt
	VERSION
Modified:
	.gitignore
 2014-06-13 16:10:25 +02:00
Sergei Golubchik
e27c338634 5.5.38 merge 2014-06-06 00:07:27 +02:00
Sergei Golubchik
77ec219d58 cmake: mark AIO_LIBRARY, EVENT_LIBRARY, GROFF, NROFF as advanced; 
use -ggdb3 if supported
 2014-06-03 10:57:57 +02:00
Sergei Golubchik
5a61516afd Merge remote-tracking branch 'origin/10.1' into 10.1-serg-merge 2014-05-26 21:14:51 +02:00
Sergei Golubchik
6a85b10dcb merge the compilation fixes from 10.0-FusionIO 2014-05-26 21:11:53 +02:00
Sergei Golubchik
9ad97c4b1e temporarily disable lzo compression 2014-05-26 20:26:51 +02:00
Sergei Golubchik
45d389fb84 lzo.cmake: don't use the same symbol for two different tests 2014-05-26 20:26:04 +02:00
Sergei Golubchik
c2b9d993e3 Merge branch '10.1' of bzr::/usr/home/serg/Abk/mysql into 10.1 2014-05-25 10:18:07 +02:00
Jan Lindström
1016ee9d77 Merge 10.0 -> 10.1 2014-05-24 21:37:21 +03:00
Sergei Golubchik
3e48269f2a git support in cmake files 2014-05-24 18:09:08 +02:00
Sergei Golubchik
05df71abd9 remove support for per-plugin bzr repositories 
we don't have closed-source plugins
 2014-05-24 18:08:23 +02:00
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
Jan Lindström
13c73c31c3 Added support for LZO compression method. 
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
 2014-04-15 14:28:25 +03:00
Jan Lindström
d64fa1d651 Additional merge to lp:maria/10.0 2014-03-04 18:56:18 +02:00
Sergei Golubchik
016bd4fc5f MDEV-5620 CMake option to compile against an external PCRE library 2014-03-04 01:22:53 +01:00
Jan Lindström
96100d6652 Merge: lp:maria/10.0 latest. 2014-03-03 14:27:56 +02:00
Sergey Vojtovich
84d13a7e88 MDEV-5081 - Simple performance improvement for MariaDB 
Currently fast mutexes have lower throuput compared to normal mutexes.
Remove them from release build configuration.
 2014-02-28 15:46:02 +04:00
Sergei Golubchik
d1d64015cf don't install mysql-test/var and cmake internal files 2014-04-14 19:50:55 +02:00
Sergei Golubchik
f5823b793d MDEV-6004 MariaDB init script fails to start (missing dependency on MariaDB-client in server RPM) 2014-04-08 09:58:33 +02:00
Sergei Golubchik
2d464b6eb7 line endings 2014-04-08 08:46:33 +02:00
Elena Stepanova
0566c34afd MDEV-6016 Packaging error with cmake 2.8.12 and greater 
Avoid CPack complaints when a pdb file is missing for a static library
(patch from Vladislav Vaintroub)
 2014-04-03 21:58:56 +04:00
Sergei Golubchik
cb67dcb618 mysql-5.5.37 selective merge 2014-03-27 22:26:58 +01:00
Sergei Golubchik
05aba79e98 MDEV-4447 MariaDB sources should have unix-style line endings everywhere 2014-02-27 12:00:16 +01:00
Sergei Golubchik
0dc23679c8 10.0-base merge 2014-02-26 15:28:07 +01:00
Sergei Golubchik
0b9a0a3517 5.5 merge 2014-02-25 16:04:35 +01:00
Tor Didriksen
3f2b13f979 Bug#18235669 MYSQL_CONFIG TO PROVIDE R FLAG ON SOLARIS 
'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.
 2014-02-25 09:07:44 +01:00
Sergei Golubchik
d81d13f177 MDEV-5390 doesn't install on fedora if mysql is installed, part 2 
On fedora:
1. provide/obsoleve mariadb-* packages
2. MariaDB-common conflicts with mariadb-libs (on filesystem level),
   but does not provide or obsolete it.
 2014-02-19 21:40:25 +01:00
Sergei Golubchik
de8f29bd3a RPM: 
* readability fixes
* CPackRPM wrapper to fix property leakage between components (cmake bug 13248)
 2014-02-19 21:40:20 +01:00
Sergei Golubchik
ce4d5fe53c RPM: fix alternative provides/obsoletes - put the correct architecture and version 2014-02-17 11:09:50 +01:00
Sergei Golubchik
84651126c0 MySQL-5.5.36 merge 
(without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
 2014-02-17 11:00:51 +01:00
Jan Lindström
fa9f5f63e9 Removed unnecessary files and set lz4 under HAVE_LZ4 compiler 
option using cmake find_library. Fixed bunch of compiler
warnings.
 2014-02-11 20:05:09 +02:00
Elena Stepanova
7258299774 Do not include .result~ files and such into packages 2014-02-10 23:53:04 +04:00
Michael Widenius
10001c8e4f Automatic merge 2014-02-05 19:23:11 +02:00
Sergei Golubchik
72c20282db 10.0-base merge 2014-02-03 15:22:39 +01:00