Commit graph

1011 commits

Author SHA1 Message Date
Sergei Golubchik
78f58792ac more adequate rpm settings
new MariaDB-shared no longer provides or replaces mysql-libs or mariadb-libs
2016-09-23 22:34:03 +02:00
Sergei Golubchik
deafe7a7aa RPM fixes for CentOS7 and Fedora 2016-09-23 16:04:16 +02:00
Sergei Golubchik
d2cfae67dc copy-paste error fixed 2016-09-22 13:07:38 +02:00
Sergei Golubchik
59d51f0c12 Merge branch '10.2' into bb-10.2-connector-c-integ-subm 2016-09-21 12:54:56 +02:00
Sergei Golubchik
7fc36e69f7 set the default socket addr for C/C 2016-09-19 20:13:49 +02:00
Sergei Golubchik
992606f256 only put real *.so.* shared libraries in compat.rpm
do not put there *.so symlinks
2016-09-19 20:13:49 +02:00
Sergei Golubchik
f9bdc7c01a Merge branch '10.2' into bb-10.2-jan 2016-09-19 09:47:08 +02:00
Sergei Golubchik
9ee34f7133 install client plugins into their old location 2016-09-14 16:09:33 +02:00
Sergei Golubchik
cacb57b7c2 pass openssl config to C/C
* set OPENSSL_FOUND
* use FindOpenSSL.cmake compatible variable names in ssl.cmake
* show openssl version in full
2016-09-12 18:16:51 +02:00
Sergei Golubchik
5ea5a7f7e7 auto-clone C/C, if possible 2016-09-12 17:51:52 +02:00
Sergei Golubchik
ece01ef3dc After-review changes
* remove redundant code
* fix tests
* move declarations and defines where they belong
2016-09-12 17:51:50 +02:00
Sergei Golubchik
12067633fb Build 10.1 compat rpm
Repack 10.1.x-shared rpm to 10.2.x-compat.rpm
Also remove old references to ourdelta rpms.
2016-09-12 17:51:50 +02:00
Sergei Golubchik
017195c363 fix RPM builds
to specify correct VENDOR and LICENSE for C/C
2016-09-12 17:51:49 +02:00
Sergei Golubchik
85828b8f22 fix "make dist" to support submodules 2016-09-12 17:51:49 +02:00
Sergei Golubchik
1fc49d3d1a Add C/C as a submodule in libmariadb/
also
* fix includes
* rename cmake macros and targets to avoid name clashes
2016-09-12 17:46:35 +02:00
Sergei Golubchik
ca02ad4fb0 fix cmake MESSAGE_ONCE macro for multi-line messages 2016-09-12 17:46:35 +02:00
Sergei Golubchik
6152784cb1 make CONNECT's finding Java and JNI less verbose 2016-09-12 17:46:35 +02:00
Jan Lindström
d3708f789d Fix bunch of test failures and solaris build missing include. 2016-09-09 10:01:18 +03:00
Sergei Golubchik
06b7fce9f2 Merge branch '10.1' into 10.2 2016-09-09 08:33:08 +02:00
Nirbhay Choubey
90266e8a0e Merge branch '10.0-galera' into bb-10.1-serg 2016-08-25 15:39:39 -04:00
Vladislav Vaintroub
34f3fd218e add libmysqlclient's dependencies to the output of mysql_config 2016-08-25 16:27:58 +02:00
Vladislav Vaintroub
22ea51eb5f Increase shared library version 2016-08-25 16:27:57 +02:00
Vladislav Vaintroub
56c4cfe0be MDEV-9293 - Use MariaDB's Connector/C in server 2016-08-25 16:27:57 +02: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
Vladislav Vaintroub
31a8cf54c8 Revert "MDEV-9293 Connector/C integration"
This reverts commit 7b89b9f510.
2016-08-19 15:46:27 +00:00
Vladislav Vaintroub
7b89b9f510 MDEV-9293 Connector/C integration 2016-08-19 15:27:37 +00:00
Sergey Vojtovich
9c2215e022 MDEV-9872 - Add common optimized CRC32 function interface
Move crc32-vpmsum to extra.
Compile static crc32-vpmsum instead of adding sources directly.
Make use of crc32-vpmsum via my_checksum().

Based on contribution by Daniel Black.
2016-08-04 10:45:20 +04:00
Sergei Golubchik
932646b1ff Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02: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
Alexey Kopytov
49ad084503 Few improvements related to CPU cache line size and padding:
Bug #79636: CACHE_LINE_SIZE should be 128 on AArch64
Bug #79637: Hard-coded cache line size
Bug #79638: Reconcile CACHE_LINE_SIZE with CPU_LEVEL1_DCACHE_LINESIZE
Bug #79652: Suspicious padding in srv_conc_t

- changed CPU_LEVEL1_DCACHE_LINESIZE to default to 128 bytes on POWER
  and AArch64 architectures in cases when no value could be detected
  by CMake using getconf

- changed CACHE_LINE_SIZE definition in ut0counter.h to be an alias of
  CPU_LEVEL1_DCACHE_LINESIZE

- changed a number of hard-coded 64-byte cache line size values in the
  InnoDB code

- fixed insufficient padding for srv_conc members in srv0conc.cc

Ported to Mariadb by Daniel Black <daniel.black@au.ibm.com>
Added s390 cache size of 256 at same time.
2016-06-07 13:02:31 +04:00
Vladislav Vaintroub
3a7bc23a16 MDEV-9154 : Remove workarounds (mainly dynamic function loading)
for running obsolete versions of Windows
2016-06-01 20:29:10 +02: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
f67a2211ec Merge branch '10.1' into 10.2 2016-03-23 22:36:46 +01: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
Sergei Golubchik
00d1db7a38 Merge branch '10.1' into 10.2 2016-02-25 18:19:55 +01: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