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
Nirbhay Choubey
d939fad231
Added rsync to galera server's rpm dependency list.
2014-05-29 21:02:17 -04:00
Nirbhay Choubey
bd5ca5e609
MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' is
...
not in the dependency list
Added socat, grep, gawk, iproute, coreutils, findutils to the
dependency list.
2014-05-25 00:18:26 -04:00
Nirbhay Choubey
ab4947463e
Merging changes from maria-5.5-galera and
...
some test fixes.
bzr merge -r3479..3493 maria-5.5-galera
2014-05-22 18:31:04 -04:00
Nirbhay Choubey
086af8367e
bzr merge -r4209 maria/10.0.
2014-05-21 11:09:55 -04:00
Nirbhay Choubey
586fab72f0
Merging deb/rpm script changes from maria-5.5-galera.
2014-03-24 16:40:24 -04: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
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
Seppo Jaakola
496e22cf3b
merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
...
and a number of fixes to make this buildable.
Run also few short multi-master high conflict rate tests, with no issues
2013-12-04 10:32:43 +02:00
Sergei Golubchik
d1f2ba3985
MDEV-5250 doesn't install on fedora if mysql is installed
...
when our package is to replace "mysql", it has both provide and obsolete it
2013-11-07 13:22:27 +01:00
Sergei Golubchik
265bbf5fe1
introduce sysconf2dir, install tokudb.conf there, both in rpm and deb
2013-09-10 22:59:18 +02:00