Commit graph

449 commits

Author SHA1 Message Date
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
Sergei Golubchik
862fbc277c bugfix: debian, fix *.so symlinks in libmariadb-dev
The symlink

/usr/lib/libmysqlclient.so -> /usr/lib/libmysqlclient.so.18

was invalid, because the library was not in /usr/lib.
The correct symlink is

/usr/lib/x86_64-linux-gnu/libmysqlclient.so -> /usr/lib/x86_64-linux-gnu/libmysqlclient.so.18
2017-09-18 10:12:23 +02:00
Sergei Golubchik
b5ead3a658 MDEV-13589 libmariadbclient18 is broken when using mariadb repo instead of debian's
put libmariadbclient18 symlinks into libmariadbclient18.deb package,
not into libmariadb3.deb, because installing/reinstalling
libmariadbclient18.deb must recreate these symlinks.
2017-09-18 10:12:23 +02:00
Marko Mäkelä
4e1fa7f63d Merge bb-10.2-ext into 10.3 2017-09-01 11:33:45 +03:00
Marko Mäkelä
a36c369bda Merge 10.1 into 10.2
For running the Galera tests, the variable my_disable_leak_check
was set to true in order to avoid assertions due to memory leaks
at shutdown.

Some adjustments due to MDEV-13625 (merge InnoDB tests from MySQL 5.6)
were performed. The most notable behaviour changes from 10.0 and 10.1
are the following:

* innodb.innodb-table-online: adjustments for the DROP COLUMN
behaviour change (MDEV-11114, MDEV-13613)

* innodb.innodb-index-online-fk: the removal of a (1,NULL) record
from the result; originally removed in MySQL 5.7 in the
Oracle Bug #16244691 fix
377774689b

* innodb.create-index-debug: disabled due to MDEV-13680
(the MySQL Bug #77497 fix was not merged from 5.6 to 5.7.10)

* innodb.innodb-alter-autoinc: MariaDB 10.2 behaves like MySQL 5.6/5.7,
while MariaDB 10.0 and 10.1 assign different values when
auto_increment_increment or auto_increment_offset are used.
Also MySQL 5.6/5.7 exhibit different behaviour between
LGORITHM=INPLACE and ALGORITHM=COPY, so something needs to be tested
and fixed in both MariaDB 10.0 and 10.2.

* innodb.innodb-wl5980-alter: disabled because it would trigger an
InnoDB assertion failure (MDEV-13668 may need additional effort in 10.2)
2017-08-31 09:30:40 +03:00
Marko Mäkelä
829752973b Merge branch '10.0' into 10.1 2017-08-30 13:06:13 +03:00
Elena Stepanova
05e7d35e89 MDEV-13583 Improvements for MTR rebootstrap introduced in MDEV-12042
- make re-bootstrap run with all extra options, not only InnoDB ones
- re-use previously created bootstrap.sql
- add --console
- fix debian patch to keep it applicable
2017-08-28 19:49:02 +03:00
Sergei Golubchik
bb8e99fdc3 Merge branch 'bb-10.2-ext' into 10.3 2017-08-26 00:34:43 +02:00
Sergei Golubchik
3ec96c1824 MDEV-13370 Ambiguous behaviour regarding installation of header files
install all server includes under /usr/include/mysql/server/
and C/C includes under /usr/include/mysql/
2017-08-14 19:45:58 +02:00
Marko Mäkelä
620ba97cfc Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 2017-08-09 12:59:39 +03:00
Sergei Golubchik
8e8d42ddf0 Merge branch '10.0' into 10.1 2017-08-08 10:18:43 +02:00
Sergei Golubchik
b7381526ab Always require OpenSSL 1.0 on Debian
auto-detecting whether it's called libssl-dev or libssl1.0-dev
2017-08-08 09:56:34 +02:00
Sergey Vojtovich
6d51817d2c Support for server error messages in Hindi
Include Hindi error messages to debian packages.
2017-08-04 13:33:48 +04:00
Vicențiu Ciorbaru
786ad0a158 Merge remote-tracking branch 'origin/5.5' into 10.0 2017-07-25 00:41:54 +03:00
Alexander Barkov
e67b816451 Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 2017-07-19 19:43:55 +04:00
Daniel Black
f9dbfa58a5 MDEV-658: debian debug symbols require compat 9
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
2017-07-18 15:41:22 +02:00
Sergei Golubchik
a76c05bba0 Require either OpenSSL 1.0 or 1.1 on Debian 2017-07-13 09:14:17 +02:00
Vicențiu Ciorbaru
1d730ac42d Rename mariadb-backup-10.2.files to mariadb-backup-10.2.install
.files extension is not used by debian packaging, .install is.
2017-07-12 21:41:29 +03:00
Vladislav Vaintroub
51a552ddf2 Fix debian control file syntax. 2017-07-09 06:10:17 +00:00
Vladislav Vaintroub
2312556bba Attempt to fix mariabackup debian packaging in 10.3 2017-07-08 21:57:54 +00:00
Marko Mäkelä
57fea53615 Merge bb-10.2-ext into 10.3 2017-07-07 12:39:43 +03:00
Vladislav Vaintroub
c5a525bda2 mariabackup : debian packaging 2017-07-05 11:05:35 +00:00
Marko Mäkelä
2a3fe45dd2 Remove XtraDB
The XtraDB storage engine was already replaced by InnoDB
and disabled in MariaDB Server 10.2. Let us remove it altogether
to avoid dragging dead code around.

Replace some references to XtraDB with references to InnoDB.

rpl_get_position_info(): Remove.

Remove the mysql-test-run --suite=percona, because it only contains
tests specific to XtraDB, many of which were disabled already in
earlier MariaDB versions.
2017-06-21 13:44:16 +03:00
Marko Mäkelä
3d615e4b1a Merge branch 'bb-10.2-ext' into 10.3
This excludes MDEV-12472 (InnoDB should accept XtraDB parameters,
warning that they are ignored). In other words, MariaDB 10.3 will not
recognize any XtraDB-specific parameters.
2017-06-02 09:36:04 +03:00
Vicențiu Ciorbaru
844a575946 MDEV-12449: Debian Packaging AWS key management plugin
* Update debian control file to include AWS key management plugin.
* Update dependencies in control file to include uuid.
* Include enable_encryption.preset with the aws-key-management plugin.
2017-05-08 21:42:41 +03:00
Alexander Barkov
314350a722 Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 2017-05-07 23:51:18 +04: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
Sergei Golubchik
54e24fcbd5 Compile user_variables plugin statically
Recompile it for embedded.
Test it for embedded.
Promote it to Gamma
2017-04-30 14:58:11 +02:00
Nirbhay Choubey
3d8aacba86 SST script for mariabackup.
Execute mariabackup in innobackupex mode to avoid "unknown argument" error.
2017-04-27 19:12:41 +02:00
Vladislav Vaintroub
1991411f16 MDEV-9566 MariaBackup packaging 2017-04-27 19:12:40 +02:00
Vicențiu Ciorbaru
b97a8b123f Fix remnant of RocksDB sed delete
Added 4 extra lines in 10.3 so we need to delete more.
2017-04-06 21:35:43 +03:00
Vicențiu Ciorbaru
0ecbaae816 Fix debian install due to mariadb-client-core circular conflict
Aptitude provided the following error message without this fix:
 mariadb-client-core-10.3 :
    Conflicts: mysql-client-5.1 which is a virtual package, provided by:
             - mariadb-client-10.3, but 10.3.0+maria~xenial is to be installed.
    Conflicts: mysql-client-5.5 which is a virtual package, provided by:
             - mariadb-client-10.3, but 10.3.0+maria~xenial is to be installed.
2017-04-06 20:39:17 +03:00
Vicențiu Ciorbaru
32a6621ac9 Fix rocksdb plugin && make mariadb-client-10.3 replace mariadb-client-10.2 2017-04-06 20:39:17 +03:00
Vicențiu Ciorbaru
75b8fe4f18 Update debian packaging to work in 10.3
* Rename all files to use 10.3 in the filename
* Adjust rules to delete extra lines from control file
* Adjust control file to have correct Replaces/Breaks list for each
  package
* Add libcurl3-dev as build dependency for mariadb server in debian
2017-04-05 22:27:16 +03:00
Sergei Petrunia
44bc2a0ef7 Post-fixes for "Rename plugin rocksdb_se to rocksdb"
- Also rename plugin's config file
- And fix unit test's CMakeLists.txt
2017-04-02 23:38:28 +03:00
Vicențiu Ciorbaru
321f5d9d70 Fix debian architecture parsing 2017-04-01 10:17:26 +03:00
Sergei Petrunia
5210c69e71 Merge 10.2 into bb-10.2-mariarocks 2017-03-31 01:14:00 +03:00
Sergei Golubchik
da4d71d10d Merge branch '10.1' into 10.2 2017-03-30 12:48:42 +02:00
Vicențiu Ciorbaru
c29336f2b0 Skip rocksdb on debian i386 and when gcc version is < 4.8 2017-03-26 18:38:20 +03:00
Vicențiu Ciorbaru
a421f0b6b8 Add sst_dump as binary in rocksdb package 2017-03-26 00:05:24 +02:00
Vicențiu Ciorbaru
97e5ed1637 Add mysql_ldb to debian rocksdb package 2017-03-25 23:44:21 +02:00
Vicențiu Ciorbaru
69ba6b36e6 Add rocksdb as a plugin into debian packaging 2017-03-21 17:12:14 +02:00
Vicențiu Ciorbaru
21bbe10bb3 Revert "Revert "Make rocksdb build as a deb package too""
This reverts commit 49de95679d.
2017-03-17 17:08:34 +02:00
Vicențiu Ciorbaru
49de95679d Revert "Make rocksdb build as a deb package too"
This reverts commit 38919f68a1.

Temporary revert to be able to see other failures until builders are
updated.
2017-03-16 09:50:26 +02:00