Commit graph

692 commits

Author SHA1 Message Date
Vicențiu Ciorbaru
3d5dff6cae Merge branch '5.5' into 10.0 2018-03-14 12:10:31 +02:00
Daniel Black
ac3fd5acac debian: VCS is on github 2018-02-25 00:19:42 +04:00
Marko Mäkelä
b006d2ead4 Merge bb-10.2-ext into 10.3 2018-02-15 10:22:03 +02:00
Sergei Petrunia
7beaa5e34e Merge branch 'bb-10.2-mariarocks' into 10.2 2018-02-09 13:44:38 +03:00
Vladislav Vaintroub
6c5d364956 MDEV-14953 - rename libmysqld.so to libmariadbd.so 2018-02-08 12:02:49 +00:00
Vicentiu Ciorbaru
adbf6caad6 debian/control Include myrocks_hotbackup into mariadb-plugin-rocksdb 2018-02-07 13:08:19 +00:00
Vicentiu Ciorbaru
699123fdc3 Fix rocksdb compiler version identification with GCC
GCC 7 with only dumpversion flag returns the major version only.
dumpfullversion flag makes it work with both new and old gcc.
2018-02-07 13:07:34 +00:00
Sergei Golubchik
4771ae4b22 Merge branch 'github/10.1' into 10.2 2018-02-06 14:50:50 +01:00
Sergei Golubchik
d4df7bc9b1 Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
Vicențiu Ciorbaru
d833bb65d5 Merge remote-tracking branch '5.5' into 10.0 2018-01-24 12:29:31 +02:00
Sergei Golubchik
8f102b584d Merge branch 'github/10.3' into bb-10.3-temporal 2018-01-17 00:45:02 +01:00
Otto Kekäläinen
1d522353c8 Deb: wrap-and-sort -a the lib* packages in debian/control
This way all the libraries are listed in a logical order and it will later
be easier to compare the control file contents to downstream versions.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
3862d8bc89 Deb: wrap-and-sort -a 2018-01-16 13:48:00 +02:00
Otto Kekäläinen
72768cf188 Deb: Warn if sources contain a file that is not installed anywhere 2018-01-16 13:48:00 +02:00
Otto Kekäläinen
b5edb4ca3a Deb: Add missing files into correct packages and rest in not-installed
There was a lot of files generated by the sources that were not installed
in any package. This fixes most of those issues, but not all. Files still
outside any package are in the not-installed, which is used by dh_install.

Also make sure all configuration files are installed to the correct
location that matches layout used by Debian official packages.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
dbc9cfa52b Deb: .manpages files should only contain man pages unique to deb packages
All man pages that stem from the actual sources should be installed along
everything else in .install files.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
711e8c5634 MDEV-12642: Build deb source packages on buildbot, just not on Travis-CI 2018-01-16 13:48:00 +02:00
Otto Kekäläinen
a41192def8 Deb: Fix spelling etc Lintian complaints 2018-01-16 13:48:00 +02:00
Otto Kekäläinen
ed00fd2bce Deb: switch from usr/include/mysql to usr/include/mariadb
Matching libmariadb-dev package contents in official Debian repositories,
the MariaDB Connector/C files should go into a folder using the 'mariadb'
name. For compatibility with sources that expect to find 'mysql' stuff,
create a symlink from include/mysql to include/mariadb.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
5b3bf57be2 Deb: Install missing man pages 2018-01-16 13:48:00 +02:00
Otto Kekäläinen
be59851ad9 Deb: Match official Debian package libmariadb-dev-compat
Using this package any source that expects MySQL Client libraries should
build without changes. Sources that expect MariaDB Connector C should
build using only libmariadb-dev.

Current MariaDB Connector/C does not build quite identically in
this source tree compared to how it build in Debian official.
The remaining differences are tracked in MDEV-14921.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
9ef2268eda Deb: Simplify libmariadb.so.3 links
No path is required. These files always reside in the same directory
anyway.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
65db816c32 Deb: Split libmysqlclient19/20 compat links into a separate package
We already ship libmysqlclient18 that replaces any existing package
with the same name and install symlinks that point to out libmariadb.so.

Instead of creating more packages, we add just one more that does the
same and provides both libmysqlclient19 and -20 replacements symlinks.

This is a clean solution, because systems that only use (and are built
against) libmariadb will not need them and if somebody has done a mistake
in the linker parameters, they will spot it and can easily update the
filename to libmariadb.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
90f1f72622 Deb: Add missing files to packages
- tokuft_logprint should be shipped in the TokuDB plugin
- mysql_install_db is needed for installing/upgrading the datadir
  so it must be in the server core package so users can roll their
  own upgrades
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
503fcfb80f Deb: Re-remove unnecessary version suffixes from package names
There is no point in having version suffixes in plugin packages. They
will via their control file anyway depend on the correct server or client
version. Having version suffices has no benefit and it just complicates
upgrades when a new major version name package needs to replace all
possible previous version.

This issue was overlooked when merging commit
844a575946 from 10.2 into 10.3, so it
needs to be manually fixed now.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
9719fb4bef Deb: Re-rename *.files into *.install
The correct format for new Debian packages is to define install lists
as *.install files. This has already been fixed for 10.3, but it when
merging commit c5a525bda2 from 10.2, this
change was overlooked and a file of the old format slipped in.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
846517d9b7 Deb: Recover include/mariadb wrongly removed in commit 9b10b4181f
The libmariadb-dev package must include this directory so that downstream
developers can intentionally include MariaDB libraries as they want.

This matches the contents of the official Debian libmariadb-dev package.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
094938255d Deb: sync architecture restrictions from packaging in Debian official 2018-01-16 13:48:00 +02:00
Otto Kekäläinen
e260c6a087 Fix commit 9631d933fb so Travis CI doesn't fail
TokuDB and Mroonga are not built on Travis CI to save time. Previously
their packages were not created due to a hack in debian/rules, that got
removed in commit 9631d933fb. This change complements that commit.
2018-01-16 13:48:00 +02:00
Sergey Vojtovich
7e3c1e02b7 MDEV-14796 - debian: insecure root password is only if plugin is empty
Enumerate plugins that use password field.
2018-01-15 16:21:45 +04:00
Daniel Black
1879b2b8df debian: insecure root password is only if plugin is empty 2018-01-15 16:19:53 +04:00
Sergei Golubchik
7e1738c3c4 fix debian builds 2018-01-13 02:01: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
Aleksey Midenkov
c59c1a0736 System Versioning 1.0 pre8
Merge branch '10.3' into trunk
2018-01-10 12:36:55 +03:00
Marko Mäkelä
145ae15a33 Merge bb-10.2-ext into 10.3 2018-01-04 09:22:59 +02:00
Sergei Golubchik
76056559ac MDEV-9869 INSTALL SONAME 'ha_connect'
fix 011497bd60

in RPM and DEB: storage engine packages must require the server
package of exactly correct version.
2017-12-25 12:00:52 +01:00
Sergei Golubchik
9631d933fb debian: don't be smart about skipping plugins 2017-12-25 12:00:51 +01:00
Aleksey Midenkov
5c0a19c873 System Versioning 1.0 pre7
Merge branch '10.3' into trunk
2017-12-21 11:16:42 +03:00
Monty
2e53b96a0a Moved semisync from a plugin to normal server
Part of MDEV-13073 AliSQL Optimize performance of semisync

Did the following renames to match other similar variables
key_ss_mutex_LOCK_binlog_       > key_LOCK_bing
key_ss_cond_COND_binlog_send_  -> key_COND_binlog_send
COND_binlog_send_              -> COND_binlog_send
LOCK_binlog_                   -> LOCK_binlog

debian/mariadb-server-10.2.install does not install semisync libs.
2017-12-18 13:43:36 +02:00
Aleksey Midenkov
6e0b2c7fe0 System Versioning 1.0pre2
Merge branch '10.3' into trunk
2017-11-23 19:41:44 +03:00
Eugene Kosov
0b40a981de Scripts: versioning plugin in deb package [closes #332] 2017-11-22 15:31:04 +03:00
Aleksey Midenkov
b0c44d2874 Misc: Debian patch for db.Delete_versioning_rows_priv 2017-11-22 15:31:03 +03:00
Otto Kekäläinen
325c9ce9b3 Travis-CI: slim down the deb build so it passes in the 50 minute time limit
The Debian packaging build was failing on Travis-CI due to timeouts.
These changes make it faster by skipping less relevant parts of the build,
like the test suite, RocksDB, TokuDB and Mroonga.

Also fix the usage of the 'make -j' flag to not have any spaces as
recommended in an example in the Debian policy.
2017-11-21 13:07:26 +02:00
Aleksey Midenkov
a899e52d08 Misc: Debian patches update 2017-11-13 19:11:03 +03:00
Marko Mäkelä
e3d44f5d62 Merge bb-10.2-ext into 10.3 2017-09-21 08:12:19 +03:00
Sergei Golubchik
f3b6c49f8f MDEV-13589 libmariadbclient18 is broken when using mariadb repo instead of debian's
followup for b5ead3a658

libmariadb3 does not replace 10.1's libmariadbclient18 anymore,
but it still conflicts with it, both install dialog.so
2017-09-20 23:13:50 +02:00
Vicențiu Ciorbaru
325718c996 Remove libmariadbclient18.links post merge
It is only valid for 10.1
2017-09-20 00:46:01 +03:00
Vicențiu Ciorbaru
22c322c649 Merge branch '10.1' into 10.2 2017-09-19 12:43:02 +03:00
Sergei Golubchik
f7294f5b36 MDEV-13208 Cannot import libmariadbclient.so.18 from python
create libmariadbclient.so compatibility symlinks on debian
2017-09-18 10:40:26 +02:00
Sergei Golubchik
031a0404e7 bugfix: debian dependencies
mariadb-client-core-10.2, mariadb-client-10.2, and
mariadb-server-core-10.2 should not depend on libmariadb3 - they
do not have any binaries dynamically linked with libmariadb3.so
2017-09-18 10:12:23 +02:00