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

79 commits

Author SHA1 Message Date
Sergei Golubchik
355ee6877b MDEV-13946 Server RPMs have dependency on "which" 
cleanup. use "command -v" instead of "which"
simplify some checks.
 2018-02-12 12:46:34 +01:00
Otto Kekäläinen
c9c28bef3c Minor spelling fixes in code comments, docs and output 
This commit does not touch any variable names or any other actual code,
and thus should not in any way affect how the code works.
 2018-01-12 16:49:02 +02:00
Sergei Golubchik
e0a1c745ec Merge branch '10.1' into 10.2 2017-10-24 14:53:18 +02:00
Sergei Golubchik
9749568deb MDEV-13946 Server RPMs have dependency on "which" 
SLES11 doesn't have a dedicated package for "which",
it's part of the "util-linux" package
 2017-10-09 18:24:43 +02:00
Sergei Golubchik
f6633bf058 Merge branch '10.1' into 10.2 2017-07-05 19:08:55 +02:00
Vicențiu Ciorbaru
2e335a471c Merge remote-tracking branch '10.0' into 10.1 2017-06-21 16:19:43 +03:00
Vicențiu Ciorbaru
8baf9b0c46 Merge remote-tracking branch '5.5' into 10.0 2017-06-20 12:31:17 +03:00
Sergei Golubchik
48429359d6 MDEV-4646 No mysqld-debug or debuginfo in MariaDB-Server RPM 2017-06-18 21:53:45 +02:00
Daniel Black
e548e2184b Use CPACK_RPM_FILE_NAME="RPM-DEFAULT" 
This has been implemented in for cmake-3.6 to match distro version
of what the filename should look like.

Thanks to Domen Vranka for the suggestion.
 2017-06-18 21:53:45 +02:00
Marko Mäkelä
14c6f00a9f Merge 10.1 into 10.2 
Also, include fixes by Vladislav Vaintroub to the
aws_key_management plugin. The AWS C++ SDK specifically depends on
OPENSSL_LIBRARIES, not generic SSL_LIBRARIES (such as YaSSL).
 2017-05-06 14:36:46 +03:00
Vladislav Vaintroub
1991411f16 MDEV-9566 MariaBackup packaging 2017-04-27 19:12:40 +02:00
Kristian Nielsen
39f1917f46 Attempt to fix strange rpm dependency issue following prior patch 2017-04-20 16:36:22 +02:00
Sergei Golubchik
4a5d25c338 Merge branch '10.1' into 10.2 2016-12-29 13:23:18 +01:00
Nirbhay Choubey
dbb06d2eab MDEV-10954: MariaDB Galera: wsrep_sst_common: line 120: which: command not found 
Add 'which' to REQUIRES list.
 2016-12-12 08:51:50 -05:00
Kristian Nielsen
022aeda4c0 Attempt to fix strange rpm dependency issue following prior patch 2016-11-21 08:24:10 +01:00
Sergei Golubchik
66d9696596 Merge branch '10.0' into 10.1 2016-09-28 17:55:28 +02:00
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
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
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
Kristian Nielsen
af3dc4825b Attempt to fix strange rpm dependency issue following prior patch 2016-09-10 20:42: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
iangilfillan
6befd84202 Update AskMonty and Atlassian references to MariaDB 2016-03-08 15:24:01 +02: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
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
1623995158 Merge branch '5.5' into 10.0 2015-12-13 00:10:40 +01:00
Julien Pivotto
584c07bd88 MDEV-8978 Specify GPL version in RPM metadata 
The License field in the MariaDB RPM packages is GPL. This does not tell
the version of GPL and might confuse tools and users that rely on this
field.

Best practice in the RPM world is to use "GPLv2" for the GPL 2.0
license.

The commit switches the license field of the RPM packages to GPLv2.
 2015-12-09 13:41:41 +01:00
Sergey Vojtovich
d6480f49ff Fixed Fedora 22 package build failure. 
Since MariaDB packages have absolute paths, they are marked as not relocatable
by setting CPACK_RPM_PACKAGE_RELOCATABLE. According to logics of recent CPackRPM
it is not enough: one needs to set CPACK_PACKAGE_RELOCATABLE additionally.
 2015-10-26 20:43:23 +04:00
Sergey Vojtovich
950e6f5b43 Fixed Fedora 22 package build failure. 
Since MariaDB packages have absolute paths, they are marked as not relocatable
by setting CPACK_RPM_PACKAGE_RELOCATABLE. According to logics of recent CPackRPM
it is not enough: one needs to set CPACK_PACKAGE_RELOCATABLE additionally.
 2015-10-12 17:51:50 +02:00
Sergei Golubchik
658992699b Merge tag 'mariadb-10.0.20' into 10.1 2015-06-27 20:35:26 +02:00
Sergei Golubchik
b988553c52 MDEV-7771 missing client plugins when mariadb-shared is not installed 
Put client plugins into -common rpm, not -shared.
Because they're needed for
* all clients that link with shared libmysqlclient (-shared)
* our clients from -client rpm, they're statically linked (-client)
* the server that acts as a replication slave (-server)
 2015-06-15 20:28:13 +02: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
Nirbhay Choubey
f6e1906ced MDEV-7470: MariaDB-Galera-server uses 'tar', but 'tar' is 
not in the dependency list

Added tar to the dependency list.
 2015-01-18 18:16:36 -05:00
Sergei Golubchik
3f118a74be MDEV-6347 Build RHEL7 packages 
add "mysql-compat-server" alias to MariaDB-server package
 2015-01-16 18:13:02 +01:00
Nirbhay Choubey
41367e4023 MDEV-7204: mariadb-galera-server el7 rpms packaging 
issue, no mariadb-server in provides
MDEV-7233: Fix issue with missing dependency socat
           when installing MariaDB-galera-server on
           RedhatEL/OracleEL/(Others?) RPM based 

* Added mariadb-server to "provides" for MariaDB Galera
  server package. (rpm)
* Removed "socat" from MariaDB Galera server's mandatory
  dependency list. (rpm)
* Moved "socat" from mandatory to optional dependency. (deb)
 2014-12-09 10:35:16 -05:00
Nirbhay Choubey
3bb02f3e6d bzr merge -rtag:mariadb-10.0.15 maria/10.0 2014-12-05 12:33:02 -05:00
Sergei Golubchik
853077ad7e Merge branch '10.0' into bb-10.1-merge 
Conflicts:
	.bzrignore
	VERSION
	cmake/plugin.cmake
	debian/dist/Debian/control
	debian/dist/Ubuntu/control
	mysql-test/r/join_outer.result
	mysql-test/r/join_outer_jcl6.result
	mysql-test/r/null.result
	mysql-test/r/old-mode.result
	mysql-test/r/union.result
	mysql-test/t/join_outer.test
	mysql-test/t/null.test
	mysql-test/t/old-mode.test
	mysql-test/t/union.test
	packaging/rpm-oel/mysql.spec.in
	scripts/mysql_config.sh
	sql/ha_ndbcluster.cc
	sql/ha_ndbcluster_binlog.cc
	sql/ha_ndbcluster_cond.cc
	sql/item_cmpfunc.h
	sql/lock.cc
	sql/sql_select.cc
	sql/sql_show.cc
	sql/sql_update.cc
	sql/sql_yacc.yy
	storage/innobase/buf/buf0flu.cc
	storage/innobase/fil/fil0fil.cc
	storage/innobase/include/srv0srv.h
	storage/innobase/lock/lock0lock.cc
	storage/tokudb/CMakeLists.txt
	storage/xtradb/buf/buf0flu.cc
	storage/xtradb/fil/fil0fil.cc
	storage/xtradb/include/srv0srv.h
	storage/xtradb/lock/lock0lock.cc
	support-files/mysql.spec.sh
 2014-12-02 22:25:16 +01:00
Sergey Vojtovich
52fb08ac31 MDEV-6886 - Add RHEL7 RPM layout 
Set proper alternative names on RHEL7: they should match Fedora names.
 2014-10-17 15:08:50 +04: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
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
3620910eea cleanup: galera merge, simple changes 2014-10-01 23:38:27 +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