mariadb-5.5.33 merge

5 files changed, 40 insertions, 4 deletions

diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 5376ed58974..ec725d419c2 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -15,6 +15,8 @@ set -e
 # Buildbot, running the test suite from installed .debs on a clean VM.
 export DEB_BUILD_OPTIONS="nocheck"
 
+export MARIADB_OPTIONAL_DEBS="tokudb-engine"
+
 # Find major.minor version.
 #
 source ./VERSION
@@ -76,6 +78,8 @@ echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE
 #
 fakeroot dpkg-buildpackage -us -uc
 
+[ -e debian/autorm-file ] && rm -vf `cat debian/autorm-file`
+
 echo "Build complete"
 
 # end of autobake script
diff --git a/debian/dist/Debian/mariadb-galera-server-5.5.files b/debian/dist/Debian/mariadb-galera-server-5.5.files
index 87857f27912..2a7da7b27bf 100644
--- a/debian/dist/Debian/mariadb-galera-server-5.5.files
+++ b/debian/dist/Debian/mariadb-galera-server-5.5.files
@@ -1,6 +1,14 @@
 usr/README-wsrep
 usr/sbin/mysqld
-usr/lib/mysql/plugin/
+usr/lib/mysql/plugin/ha_innodb.so
+usr/lib/mysql/plugin/ha_oqgraph.so
+usr/lib/mysql/plugin/sphinx.so
+usr/lib/mysql/plugin/auth_socket.so
+usr/lib/mysql/plugin/auth_pam.so
+usr/lib/mysql/plugin/semisync_master.so
+usr/lib/mysql/plugin/semisync_slave.so
+usr/lib/mysql/plugin/handlersocket.so
+usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/libhsclient.so.*
 etc/mysql/debian-start
 etc/mysql/conf.d/mysqld_safe_syslog.cnf
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules
index 28eb9015e36..75a5ee57db2 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -199,7 +199,15 @@ install: build
 	cp debian/mariadb-galera-server-5.5.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
 	cp debian/additions/debian-start $$d/_etc_mysql_debian-start;
 
-	dh_movefiles
+	autorm=debian/autorm-file;                                      \
+	rm -f $$autorm;                                                 \
+	ignore='';                                                      \
+	for p in $$MARIADB_OPTIONAL_DEBS; do                            \
+	  p=mariadb-$$p-5.5;                                            \
+	  dh_movefiles --package=$$p || echo "../$$p*.deb" >> $$autorm; \
+	  ignore="$$ignore --no-package=$$p";                           \
+	done;                                                           \
+	sh -c "dh_movefiles $$ignore"
 
 # Build architecture-independent files here.
 binary-indep: build install
diff --git a/debian/dist/Ubuntu/mariadb-galera-server-5.5.files b/debian/dist/Ubuntu/mariadb-galera-server-5.5.files
index c30fa841749..2f2e233e5e3 100644
--- a/debian/dist/Ubuntu/mariadb-galera-server-5.5.files
+++ b/debian/dist/Ubuntu/mariadb-galera-server-5.5.files
@@ -1,6 +1,14 @@
 usr/README-wsrep
 usr/sbin/mysqld
-usr/lib/mysql/plugin/
+usr/lib/mysql/plugin/ha_innodb.so
+usr/lib/mysql/plugin/ha_oqgraph.so
+usr/lib/mysql/plugin/sphinx.so
+usr/lib/mysql/plugin/auth_socket.so
+usr/lib/mysql/plugin/auth_pam.so
+usr/lib/mysql/plugin/semisync_master.so
+usr/lib/mysql/plugin/semisync_slave.so
+usr/lib/mysql/plugin/handlersocket.so
+usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/libhsclient.so.*
 etc/apparmor.d/usr.sbin.mysqld
 usr/share/apport/package-hooks/source_mariadb-5.5.py
diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules
index 51683040acd..18f67812ec6 100755
--- a/debian/dist/Ubuntu/rules
+++ b/debian/dist/Ubuntu/rules
@@ -204,7 +204,15 @@ install: build
 	# install Apport hook
 	install -D -m 644 debian/mariadb-server-5.5.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-5.5.py
 
-	dh_movefiles
+	autorm=debian/autorm-file;                                      \
+	rm -f $$autorm;                                                 \
+	ignore='';                                                      \
+	for p in $$MARIADB_OPTIONAL_DEBS; do                            \
+	  p=mariadb-$$p-5.5;                                            \
+	  dh_movefiles --package=$$p || echo "../$$p*.deb" >> $$autorm; \
+	  ignore="$$ignore --no-package=$$p";                           \
+	done;                                                           \
+	sh -c "dh_movefiles $$ignore"
 
 # Build architecture-independent files here.
 binary-indep: build install