mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
164974 commits 2784 branches 343 tags 1.6 GiB
Commit graph

561 commits

Author SHA1 Message Date
Sergei Golubchik
0cbe0c9c6d remove one cmake MESSAGE 
(one generally should not do that, these messages are
printed on every cmake run)
 2015-04-05 13:14:37 +02:00
Alexey Botchkov
52a1b5a8c2 MY_CHECK_AND_SET_COMPILER_FLAG changes 
* watch for "redefined macro" warning
* don't enable -D_FORTIFY_SOURCE=2 in debug builds (it requires -O)
 2015-03-11 13:05:03 +04:00
Sergei Golubchik
2db62f686e Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
Sergei Golubchik
d7e7862364 Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
Sergei Golubchik
5dce6aa1fe Merge remote-tracking branch 'bzr/5.5' into bb-5.5-merge 2015-02-12 13:14:55 +01:00
Sergei Golubchik
8e80f91fa3 Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42 2015-02-11 23:50:40 +01:00
Sergei Golubchik
75884242ab restore a cross-compiling bit that was lost in a merge 2015-02-10 10:19:42 +01:00
Sergei Golubchik
8e7649867f Merge 10.0-galera into 10.1 2015-02-06 16:14:23 +01:00
Sergei Golubchik
4b21cd21fe Merge branch '10.0' into merge-wip 2015-01-31 21:48:47 +01:00
Nirbhay Choubey
7cda4bee0e maria-10.0.16 merge 
bzr merge -r4588 maria/10.0
 2015-01-26 22:54:27 -05:00
Sergei Golubchik
d9c01e4b4a 5.5 merge 2015-01-21 12:03:02 +01:00
Sergei Golubchik
a978bdda1e mysql-5.5.41 merge 2014-12-19 11:35:44 +01:00
Tor Didriksen
8e94f12823 Bug#20136840 REMOVE REMAINING REFERENCES TO BZR IN CMAKE SCRIPTS 
Patch for 5.5
 2014-12-11 12:46:04 +01:00
Tor Didriksen
2ee7167bbd Bug#19908468 PLACE CORRECT INFORMATION IN INFO_SRC AFTER TRANSITIONING TO GIT 
Use 'git log -1; git branch' rather than 'bzr version-info'
 2014-11-11 16:01:13 +01:00
Tor Didriksen
9bd6e87545 Bug#19890133 MAKE DIST USING BZR EXPORT EVEN FOR SOURCE DIR NOT A BZR REPO 
For 'make dist': only use 'bzr export' if bzr root == ${CMAKE_SOURCE_DIR}
Same thing for git.
 2014-11-11 10:58:47 +01:00
Balasubramanian Kandasamy
56378ab9ce Added sles11 repo packages 2014-11-04 08:44:08 +01:00
Balasubramanian Kandasamy
0773c7f422 Added sles11 repo packages 2014-11-04 08:30:23 +01:00
Sergei Golubchik
f62c12b405 Merge 10.0.14 into 10.1 2014-10-15 12:59:13 +02:00
Jon Olav Hauglid
57eec7bc29 Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG 
Bug#17959689: MAKE GCC AND CLANG GIVE CONSISTENT COMPILATION WARNINGS
Bug#18313717: ENABLE -WERROR IN MAINTANER MODE WHEN COMPILING WITH CLANG
Bug#18510941: REMOVE CMAKE WORKAROUNDS FOR OLDER VERSIONS OF OS X/XCODE
  
Backport from mysql-5.6 to mysql-5.5
 2014-10-13 09:52:28 +02:00
Jon Olav Hauglid
8b64f82505 Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG 
Bug#17959689: MAKE GCC AND CLANG GIVE CONSISTENT COMPILATION WARNINGS
Bug#18313717: ENABLE -WERROR IN MAINTANER MODE WHEN COMPILING WITH CLANG
Bug#18510941: REMOVE CMAKE WORKAROUNDS FOR OLDER VERSIONS OF OS X/XCODE
  
Backport from mysql-5.6 to mysql-5.5
 2014-10-13 09:52:28 +02:00
Sergei Golubchik
5ca5f92a1d MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config 2014-10-11 18:53:06 +02:00
Sergei Golubchik
7f5e51b940 MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes) 
remove:
* NDB from everywhere
* IM from mtr-v1
* packaging/rpm-oel and packaging/rpm-uln
* few unused spec files
* plug.in file
* .bzrignore
 2014-10-11 18:53:06 +02:00
Sergei Golubchik
dbda20caff remove mariadb.pc file again, it cannot be added in a GA version 2014-10-08 09:35:00 +02:00
Sergei Golubchik
604b653394 MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config 
1. move cflags/libs cleanup from mysql_config.sh (runtime)
   to for_client.cmake (build time). Include/library paths are
   still calculated at runtime (they depend on the location of mysql_config)

2. Use cleaned-up cflags/libs to generate mariadb.pc

3. remove obsolete @expansions@ from mysql_config (for variables that are
   never set in cmake files)
 2014-10-02 16:58:26 +02:00
Sergei Golubchik
f13cf62147 don't enable SECURITY_HARDENED on old gcc 
on CentOS 5 x86 (at least) this results in a binary
that cannot load plugins. Draw the line, quite
arbitrarily, at gcc 4.6.
 2014-10-01 23:48:36 +02:00
Sergei Golubchik
3620910eea cleanup: galera merge, simple changes 2014-10-01 23:38:27 +02:00
Nirbhay Choubey
9a57de86be bzr merge -r4123..4144 codership/5.6 2014-09-30 18:06:15 -04:00
Nirbhay Choubey
c916085e27 bzr merge -rtag:mariadb-10.0.14 maria/10.0/ 2014-09-28 20:43:56 -04:00
Sergei Golubchik
7e29c1b539 5.5 merge 2014-09-16 14:03:17 +02:00
Sergei Golubchik
32360bb728 MDEV-6526 INFO_SRC and INFO_BIN installed wrong 
don't install them at all
 2014-09-12 08:41:44 +02:00
Sergei Golubchik
4ff2a680ab MDEV-6565 search order for my.cnf inconsistent in docs/use, and global override with build-time -DDEFAULT_SYSCONFDIR is ignored 
don't let INSTALL_SYSCONFDIR overwrite DEFAULT_SYSCONFDIR
 2014-09-10 13:22:01 +02: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
James Le Cuirot
55b47649a1 MDEV-6579: Properly handle gen_pfs_lex_token when cross-compiling 2014-08-15 22:54:07 +01:00
Nirbhay Choubey
8358dd53b7 bzr merge -r4346 maria/10.0 (maria-10.0.13) 2014-08-11 23:55:41 -04:00
James Le Cuirot
fd4a4b8ff7 MDEV-6562: Fix WITHOUT_SERVER build 2014-08-11 22:43:29 +01:00
Sergei Golubchik
6fb17a0601 5.5.39 merge 2014-08-07 18:06:56 +02:00
Sergei Golubchik
3390291b95 typo fixed: only use -ggdb3 when it's supported by the compiler 2014-08-06 12:44:57 +02:00
Sergei Golubchik
1c6ad62a26 mysql-5.5.39 merge 
~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
 2014-08-02 21:26:16 +02:00
Sergei Golubchik
b7d10e5687 MDEV-5730 enhance security using special compilation options 
add a comment
 2014-06-26 12:46:33 +02:00
Sergei Golubchik
da4f8269bf MDEV-5730 enhance security using special compilation options 
-Wl,-z,relro,-z,now
-pie
-fstack-protector --param=ssp-buffer-size=4
-D_FORTIFY_SOURCE=2
 2014-06-26 11:54:13 +02: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
7434de31ac typo in CMakeLists.txt that caused USE_MYSYS_NEW to be set too early and incorrectly 2014-07-08 19:37:37 +02:00
Sergei Golubchik
528c1111ad MDEV-6410 Cross-compile fixes 
https://code.launchpad.net/~chewi/maria/mysql-fix-bug61340/+merge/217351
 2014-07-08 19:34:53 +02:00
Jon Olav Hauglid
6cb3ca5996 Bug#19001781: ADD SUPPORT FOR CMAKE 3 
Set CMP0026 and CMP0045 policies when using CMake 
version 3 or higher to restore old CMake behavior.
 2014-06-24 09:13:01 +02:00
Jon Olav Hauglid
688416794a Bug#19001781: ADD SUPPORT FOR CMAKE 3 
Set CMP0026 and CMP0045 policies when using CMake 
version 3 or higher to restore old CMake behavior.
 2014-06-24 09:13:01 +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
Nirbhay Choubey
a76a6601ec bzr merge -rtag:mariadb-10.0.12 maria/10.0 2014-06-19 13:12:38 -04:00
Balasubramanian Kandasamy
2bb7885fbc Bug#18972488 Remove packaging/rpm-uln directory from source - Updated CMakeLists.txt 2014-06-17 09:59:46 +02:00
Balasubramanian Kandasamy
ba51779cf6 Bug#18972488 Remove packaging/rpm-uln directory from source - Updated CMakeLists.txt 2014-06-17 09:59:46 +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