mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
174642 commits 2784 branches 343 tags 1.6 GiB
Commit graph

978 commits

Author SHA1 Message Date
Sergei Golubchik
a98c85bb50 Merge branch '10.0-galera' into 10.1 2016-11-02 13:44:07 +01:00
Nirbhay Choubey
5db2195a35 Merge tag 'mariadb-10.0.28' into 10.0-galera 2016-10-28 15:50:13 -04:00
Kristian Nielsen
39b7affcb1 Upstream MIPS 32bit-build-on-64bit patch from Debian Bug#838914 
From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838914

Fixes CMake so that when building a 32-bit mips binary on a 64-bit
mips machine, the target is not set as 32-bit, which apparently
confused some tests in mroonga.
 2016-10-21 23:02:56 +02:00
Sergei Golubchik
66d9696596 Merge branch '10.0' into 10.1 2016-09-28 17:55:28 +02:00
Kristian Nielsen
af3dc4825b Attempt to fix strange rpm dependency issue following prior patch 2016-09-10 20:42:20 +02:00
Nirbhay Choubey
90266e8a0e Merge branch '10.0-galera' into bb-10.1-serg 2016-08-25 15:39:39 -04:00
Nirbhay Choubey
f381ad5230 Update WSREP_PATCH_REVNO. 2016-08-21 20:13:51 -04:00
Philip Stoev
2e56c7f3cd Bump WSREP_PATCH_VERSION to 16 2016-08-21 16:20:08 -04:00
Philip Stoev
f3444c4a43 Bump WSREP_PATCH_VERSION to 14 2016-08-21 16:17:05 -04:00
Sergei Golubchik
3361aee591 Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
Sergei Golubchik
9c38308d8f MDEV-10086 no gssapi-server RPM package anymore in 10.1 
set CPACK_COMPONENTS_ALL both on the current and parent scope
 2016-06-28 12:54:01 +02:00
Nirbhay Choubey
a6816995ee MDEV-10004: Galera's pc.recovery process fails in 10.1 with systemd 
Galera recovery process works in two phases. In the first
phase, mysqld is started as non-daemon with --wsrep-recover
to recover and fetch the last logged global transaction ID.
This ID is then used in second phase as the start position
(--wsrep-start-position=XX) to start mysqld as daemon.

As this process was implemented in mysqld_safe script, the
recovery did not work when server was started using systemd.

Fixed by introducing a shell script (wsrep_recovery.sh) that
mimics the first phase of the recovery process.
 2016-06-27 18:03:24 -04:00
Sergei Golubchik
4025251efd fix rpm installation issues on Fedoras 2016-05-05 12:29:40 +02:00
Sergei Golubchik
87e3e67f43 Merge branch '10.0' into 10.1 2016-05-04 15:23:26 +02:00
Nirbhay Choubey
8a1efa1bdd Merge branch '10.0' into 10.0-galera 2016-04-29 16:50:58 -04:00
Sergei Golubchik
011497bd60 MDEV-9869 INSTALL SONAME 'ha_connect' 
make storage engine RPMs require the exact server
version RPM: "MariaDB = %{version}-%{release}",
other plugins require simply "MariaDB", as before.
 2016-04-24 18:15:20 +02:00
Sergei Golubchik
3b0c7ac1f9 Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
Sergei Golubchik
e7cf898d6d rpm: prefer the conditional %{?...} syntax 2016-03-21 11:40:37 +01:00
Sergei Golubchik
c03433dea7 rpm: ignore /usr/lib/systemd and /usr/lib/systemd/system 2016-03-21 11:40:34 +01:00
Sergei Golubchik
14771bd044 MDEV-9660 yum/rpm update from 10.0 to 10.1 replaces/obsoletes ? 
MariaDB-server-10.1 should obsolete MariaDB-Galera-server
 2016-03-21 11:39:26 +01:00
Vladislav Vaintroub
517584dde0 Provide a way to reenable DISABLED plugin with -DPLUGIN_${NAME}=STATIC|DYNAMIC 2016-03-13 20:26:21 +01:00
iangilfillan
6befd84202 Update AskMonty and Atlassian references to MariaDB 2016-03-08 15:24:01 +02:00
Nirbhay Choubey
cceec7858f Merge branch '10.0-galera' into bb-10.1-serg 2016-02-24 01:21:40 -05:00
Nirbhay Choubey
0fd9d5a656 Update WSREP_PATCH_REVNO. 2016-02-23 21:24:00 -05:00
Nirbhay Choubey
0d58323e26 Merge tag 'mariadb-10.0.24' into 10.0-galera 2016-02-23 20:53:29 -05:00
Sergei Golubchik
a5679af1b1 Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
Philip Stoev
b9c42d7a47 Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 13 2016-02-23 13:24:49 -05:00
Sergei Golubchik
ab2a9600a7 MDEV-9475 I can't finish my_install_db using binary tar distribution 
to avoid run-time libjemalloc.so dependency
link binary tarballs with a static libjemalloc_pic.a
 2016-02-23 10:46:15 +01:00
Philip Stoev
5ebf6ce7aa Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 12 2016-02-22 23:57:37 -05:00
Vladislav Vaintroub
b128f26cd5 Fix build : change MYSQL_ADD_PLUGIN to be MACRO again, rather than FUNCTION 2016-02-22 18:11:59 +01:00
Vladislav Vaintroub
c20979b163 MDEV-9601 Build client plugins, also for the cmake client-only build 
(-DWITHOUT_SERVER=1)
 2016-02-22 16:26:44 +01:00
Vladislav Vaintroub
bcd2a156ee MDEV-9833 - fix mysql_config --libs for weird cases, where mysqlclient link dependencies contain flags instead of libraries (like -pthread rather than -lpthread) 2016-02-22 12:42:28 +01:00
Sergey Vojtovich
fd8e846a3b MDEV-9564 - added s390x to lib64 INSTALL_LIBDIR handling 
Adjusted INSTALL_LIBDIR detection so that it is set to "lib64" on any 64bit
system (not only x86_64). New condition is insipired by GNUInstallDirs cmake
module.
 2016-02-18 11:01:22 +04:00
Sergei Golubchik
289fe3720e MDEV-9350 Fix jemalloc detection for FreeBSD 
on FreeBSD 10 jemalloc is in libc, no separate libjemalloc is needed
 2016-02-17 15:16:19 +01:00
Sergei Golubchik
74d86d1d27 MYSQL_ADD_PLUGIN: fix DISABLED keyword to work 2016-02-17 15:11:05 +01:00
Sergei Golubchik
271fed4106 Merge branch '5.5' into 10.0 2016-02-15 22:50:59 +01:00
Sergei Golubchik
95740bc5c5 dtrace in cmake 
1. ignore generated dtrace files
2. don't rewrite probes_mysql_nodtrace.h in-place
 2016-02-15 12:51:35 +01:00
Sergei Golubchik
c4cb240061 MDEV-9024 Build fails with VS2015 
cherry-pick f1daf9ce from 10.0 branch
-------------------------------------

Fix build failures caused by new C runtime library
- isnan, snprintf, struct timespec are now defined, attempt to
redefine them leads
- P_tmpdir, tzname are no more defined
-  lfind() and lsearch() in lf_hash.c had to be renamed,  declaration
conflicts with some C runtime functions with the same name declared in
a header included by stdlib.h

 Also fix couple of annoying warnings :
- remove #define NOMINMAX from config.h to avoid "redefined" compiler
warnings(NOMINMAX is already in compile flags)

- disable incremental linker in Debug as well (feature not used much
and compiler crashes often)

Also simplify package building with Wix, require Wix 3.9 or later
(VS2015 is not compatible with old Wix 3.5/3.6)
 2016-02-06 22:41:58 +01:00
Vladislav Vaintroub
a095c99301 Fix packaging for client RPM plugins - provide 'ignored' list 2016-01-26 17:56:41 +01:00
Sergei Golubchik
f4faac4d6a Merge branch '10.0' into 10.1 2016-01-25 22:58:57 +01:00
Sergei Golubchik
b01e2ff1cd MDEV-9385 Devel package wants ownership of /usr/share/pkgconfig on CentOS/RHEL 
add /usr/share/pkgconfig to the rpm ignored list
 2016-01-25 17:04:14 +01:00
Sergei Golubchik
0fab28cedd cmake: better auto *.i targets in Makefiles 2016-01-25 16:38:23 +01:00
Alexey Botchkov
1793646d78 Merge branch '5.5' into 10.0 
Conflicts:
	plugin/server_audit/server_audit.c
 2016-01-25 16:37:08 +04:00
Vladislav Vaintroub
4bb62e91f6 Do not require server RPM for client plugins 2016-01-20 14:35:11 +01:00
Vladislav Vaintroub
67cf76ad9b MDEV 4691- address review comments 2016-01-19 11:59:32 +01:00
Vladislav Vaintroub
5f48b61509 MDEV-9298 : Build failure when linking libmysql. 
If GCC or CLang compile with link time optimization (-flto),
they throw an error during link , when lto sees a
function (e.g mysql_real_connect) is redeclared as "external void *"
in libmysql_exports.cc

The fix disables -flto for generated libmysql_exports.cc
 2016-01-07 14:45:40 +01:00
Sergey Vojtovich
c597ed0111 MDEV-9209 - [PATCH] scripts: Do not prepend the prefix to absolute paths 
Allow absolute paths for INSTALL_*DIR.
 2015-12-22 19:13:51 +04:00
Sergei Golubchik
a2bcee626d Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
Sergei Golubchik
05dc86c09f Merge branch '5.5' into 10.0 2015-12-21 16:36:10 +01:00
Sergei Golubchik
e126baafbc MDEV-9249 MariaDB un-buildable on linux64: fails @ "error: ‘ERR_remove_state’ was not declared in this scope" when linking against OpenSSL 1.0.2e 
ERR_remove_state is deprecated, use ERR_remove_thread_state
if possible
 2015-12-21 12:17:31 +01:00