Import debian/* changes done in upstream 10.1

- 10.1 includes Galera by default. Include a Galera config section,
  a bootstrap init section and wsrep etc files in the server.
- Extend build and install dependencies to accommodate for Galera etc.
- Compare *.cnf files, update option names.
- Compare *.install files, update files lists.

Systemd changes are excluded for now.

debian/additions/mariadb.conf.d/50-server.cnf

@@ -37,7 +37,7 @@ thread_stack		= 192K
 thread_cache_size       = 8
 # This replaces the startup script and checks MyISAM tables if needed
 # the first time they are touched
-myisam-recover         = BACKUP
+myisam_recover_options  = BACKUP
 #max_connections        = 100
 #table_cache            = 64
 #thread_concurrency     = 10

debian/additions/mariadb.conf.d/60-galera.cnf

+#
+# * Galera-related settings
+#
+[galera]
+# Mandatory settings
+#wsrep_on=ON
+#wsrep_provider=
+#wsrep_cluster_address=
+#binlog_format=row
+#default_storage_engine=InnoDB
+#innodb_autoinc_lock_mode=2
+#
+# Allow server to accept connections on all interfaces.
+#
+#bind-address=0.0.0.0
+#
+# Optional setting
+#wsrep_slave_threads=1
+#innodb_flush_log_at_trx_commit=0

debian/control

@@ -232,16 +232,26 @@ Description: MariaDB database core server files
 
 Package: mariadb-server-10.1
 Architecture: any
-Suggests: mailx, mariadb-test, tinyca
+Suggests: mailx, mariadb-test, netcat-openbsd, tinyca
 Recommends: libhtml-template-perl
 Pre-Depends: adduser (>= 3.40), debconf, mariadb-common (>= ${source:Version})
-Depends: libdbi-perl,
+Depends: coreutils,
+         findutils,
+         galera-3 (>=25.3),
+         gawk,
+         grep,
+         iproute,
+         libdbi-perl,
          lsb-base (>= 3.0-10),
+         lsof,
          mariadb-client-10.1 (>= ${source:Version}),
          mariadb-server-core-10.1 (>= ${binary:Version}),
          passwd,
          perl (>= 5.6),
          psmisc,
+         rsync,
+         socat,
+         tar,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: mariadb-tokudb-engine-10.0,
@@ -388,7 +398,7 @@ Replaces: mariadb-server-10.0, mariadb-server-10.1 (<< ${source:Version})
 Description: Spider storage engine for MariaDB
  The Spider storage engine with built-in sharding features. It supports
  partitioning and xa transactions, and allows tables of different MariaDB
- instances to be handled as if they were on the same insctance. It refers to one
+ instances to be handled as if they were on the same instance. It refers to one
  possible implementation of ISO/IEC 9075-9:2008 SQL/MED.
 
 Package: mariadb-test

debian/libmariadbclient-dev.install

@@ -7,3 +7,4 @@ usr/lib/*/libmariadbclient_r.a
 usr/lib/*/libmariadbclient_r.so*
 usr/lib/*/libmysqlservices.a
 usr/share/aclocal/mysql.m4
+usr/share/pkgconfig/mariadb.pc

debian/mariadb-server-10.1.install

@@ -31,9 +31,18 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
+usr/bin/wsrep_sst_common
+usr/bin/wsrep_sst_mysqldump
+usr/bin/wsrep_sst_rsync
+usr/bin/wsrep_sst_xtrabackup
+usr/bin/wsrep_sst_xtrabackup-v2
 usr/lib/*/mariadb18/plugin/auth_pam.so
+usr/lib/*/mariadb18/plugin/file_key_management.so
+usr/lib/*/mariadb18/plugin/ha_archive.so
+usr/lib/*/mariadb18/plugin/ha_blackhole.so
+usr/lib/*/mariadb18/plugin/ha_federated.so
+usr/lib/*/mariadb18/plugin/ha_federatedx.so
 usr/lib/*/mariadb18/plugin/ha_innodb.so
-usr/lib/*/mariadb18/plugin/ha_sequence.so
 usr/lib/*/mariadb18/plugin/ha_sphinx.so
 usr/lib/*/mariadb18/plugin/handlersocket.so
 usr/lib/*/mariadb18/plugin/locales.so
@@ -43,11 +52,15 @@ usr/lib/*/mariadb18/plugin/query_response_time.so
 usr/lib/*/mariadb18/plugin/semisync_master.so
 usr/lib/*/mariadb18/plugin/semisync_slave.so
 usr/lib/*/mariadb18/plugin/server_audit.so
+usr/lib/*/mariadb18/plugin/simple_password_check.so
 usr/lib/*/mariadb18/plugin/sql_errlog.so
+usr/lib/*/mariadb18/plugin/wsrep_info.so
 usr/share/doc/mariadb-server-10.1/mysqld.sym.gz
 usr/share/mysql/errmsg-utf8.txt
 usr/share/mysql/fill_help_tables.sql
+usr/share/mysql/maria_add_gis_sp_bootstrap.sql
 usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_test_data_timezone.sql
+usr/share/mysql/wsrep_notify

debian/mariadb-server-10.1.mysql.init

@@ -186,6 +186,13 @@ case "${1:-''}" in
   fi
   ;;
 
+  'bootstrap')
+	# Bootstrap the cluster, start the first node
+	# that initiates the cluster
+	log_daemon_msg "Bootstrapping the cluster" "mysqld"
+	$SELF start "${@:2}" --wsrep-new-cluster
+	;;
+
   *)
   echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
   exit 1

debian/mariadb-test-data.install

@@ -6,3 +6,4 @@ usr/share/mysql/mysql-test/r
 usr/share/mysql/mysql-test/std_data
 usr/share/mysql/mysql-test/suite
 usr/share/mysql/mysql-test/t
+usr/share/mysql/mysql-test/unstable-tests
\ No newline at end of file

debian/mariadb-test.install

@@ -6,7 +6,9 @@ usr/lib/*/mariadb18/plugin/adt_null.so
 usr/lib/*/mariadb18/plugin/auth_0x0100.so
 usr/lib/*/mariadb18/plugin/auth_test_plugin.so
 usr/lib/*/mariadb18/plugin/daemon_example.ini
+usr/lib/*/mariadb18/plugin/debug_key_management.so
 usr/lib/*/mariadb18/plugin/dialog_examples.so
+usr/lib/*/mariadb18/plugin/example_key_management.so
 usr/lib/*/mariadb18/plugin/ha_example.so
 usr/lib/*/mariadb18/plugin/ha_test_sql_discovery.so
 usr/lib/*/mariadb18/plugin/libdaemon_example.so

debian/source.lintian-overrides

@@ -6,7 +6,6 @@ source-contains-prebuilt-windows-binary mysql-test/std_data/ctype_upgrade/mysql0
 outdated-autotools-helper-file storage/tokudb/PerconaFT/third_party/snappy-1.1.2/config.guess 2012-02-10
 outdated-autotools-helper-file storage/tokudb/PerconaFT/third_party/snappy-1.1.2/config.sub 2012-02-10
 # TokuDB requires specifically xz-4.999.9beta, and bundled xz does in fact use these autotools files
-outdated-autotools-helper-file storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/build-aux/config.guess 2009-04-27
 outdated-autotools-helper-file storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/build-aux/config.sub 2009-04-17
 # libmariadbclient-dev contains usr/bin/mysql_config which will never be multi-arch
 # (and is not multi-arch in Oracle MySQL packages either)