diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-06 16:14:23 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-06 16:14:23 +0100 |
| commit | 8e7649867f23ef4fca5ddb6678a66e414026ef7b (patch) | |
| tree | ff7649743a3bf13ea13eb80f1126a13cd756d335 /debian | |
| parent | f9448bcb2153aac614ecb260a4dd7f27b04f17a2 (diff) | |
| parent | 7cda4bee0ef7c8a3ec85e94bc1443ceaba3a64e8 (diff) | |
| download | mariadb-git-8e7649867f23ef4fca5ddb6678a66e414026ef7b.tar.gz | |
Merge 10.0-galera into 10.1
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/additions/my.cnf | 2 | ||||
| -rw-r--r-- | debian/dist/Debian/control | 6 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/control | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf index 1e0b97bf0b7..1f8bc0209eb 100644 --- a/debian/additions/my.cnf +++ b/debian/additions/my.cnf @@ -158,13 +158,13 @@ innodb_flush_method = O_DIRECT # Mandatory settings #wsrep_provider= #wsrep_cluster_address= -#wsrep_slave_threads=1 #binlog_format=row #default_storage_engine=InnoDB #innodb_autoinc_lock_mode=2 #bind-address=0.0.0.0 # # Optional setting +#wsrep_slave_threads=1 #innodb_flush_log_at_trx_commit=0 [mysqldump] diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index ffa4d02fff4..f64bff827db 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -189,14 +189,14 @@ Description: MariaDB database regression test suite Package: mariadb-server-10.1 Architecture: any -Suggests: tinyca, mailx, mariadb-test +Suggests: tinyca, mailx, mariadb-test, netcat-openbsd, socat Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Depends: mariadb-client-10.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.1 (>= ${binary:Version}), - galera (>=25.2), rsync, lsof, socat | netcat, grep, gawk, iproute, - coreutils, bsdutils, findutils + galera (>=25.2), rsync, lsof, grep, gawk, iproute, + coreutils, bsdutils, findutils, tar Provides: mariadb-server, mysql-server, virtual-mysql-server Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index f3f8dc5cb1a..36b08d05f31 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -183,14 +183,14 @@ Description: MariaDB database regression test suite Package: mariadb-server-10.1 Architecture: any -Suggests: tinyca, mailx, mariadb-test +Suggests: tinyca, mailx, mariadb-test, netcat-openbsd, socat Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Depends: mariadb-client-10.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.1 (>= ${binary:Version}), - galera (>=25.2), rsync, lsof, socat | netcat, grep, gawk, iproute, - coreutils, bsdutils, findutils + galera (>=25.2), rsync, lsof, grep, gawk, iproute, + coreutils, bsdutils, findutils, tar Provides: mariadb-server, mysql-server, virtual-mysql-server Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, |