5.5 merge and fixes for compiler/test errors

11 files changed, 83 insertions, 11 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/control b/debian/dist/Debian/control
index 9c96313045d..c66ffedfd1a 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -14,6 +14,7 @@ Package: libmariadbclient18
 Section: libs
 Architecture: any
 Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
 Description: MariaDB database client library
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -164,10 +165,11 @@ Description: MariaDB database core server files
 
 Package: mariadb-test-5.5
 Section: database
-Architecture: all
+Architecture: any
 Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
 Conflicts: mariadb-test (<< ${source:Version}),
-    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
+    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
+    mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
 Replaces: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
 Description: MariaDB database regression test suite
@@ -235,3 +237,12 @@ Description: MariaDB database regression test suite (metapackage depending on th
  This is an empty package that depends on the current "best" version of
  mariadb-test (currently mariadb-test-5.5), as determined by the MariaDB
  maintainers.
+
+Package: mariadb-tokudb-engine-5.5
+Section: database
+Architecture: any
+Depends: mariadb-server-5.5
+Description: TokuDB storage engine for MariaDB
+ TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC
+ compliant MariaDB Storage Engine that offers powerful indexing-based query
+ acceleration. http://www.tokutek.com/products/tokudb-for-mysql/
diff --git a/debian/dist/Debian/mariadb-server-5.5.files b/debian/dist/Debian/mariadb-server-5.5.files
index ad2153fe28b..15206865d4f 100644
--- a/debian/dist/Debian/mariadb-server-5.5.files
+++ b/debian/dist/Debian/mariadb-server-5.5.files
@@ -1,4 +1,12 @@
-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 feef863c5eb..f82b9ee3344 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -201,7 +201,15 @@ install: build
 	cp debian/mariadb-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/control b/debian/dist/Ubuntu/control
index d1c4917ed63..8eb5f4537ac 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -14,6 +14,7 @@ Package: libmariadbclient18
 Section: libs
 Architecture: any
 Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
 Description: MariaDB database client library
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -158,10 +159,11 @@ Description: MariaDB database core server files
 
 Package: mariadb-test-5.5
 Section: database
-Architecture: all
+Architecture: any
 Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
 Conflicts: mariadb-test (<< ${source:Version}),
-    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
+    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
+    mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
 Replaces: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
 Description: MariaDB database regression test suite
@@ -229,3 +231,12 @@ Description: MariaDB database regression test suite (metapackage depending on th
  This is an empty package that depends on the current "best" version of
  mariadb-test (currently mariadb-test-5.5), as determined by the MariaDB
  maintainers.
+
+Package: mariadb-tokudb-engine-5.5
+Section: database
+Architecture: any
+Depends: mariadb-server-5.5
+Description: TokuDB storage engine for MariaDB
+ TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC
+ compliant MariaDB Storage Engine that offers powerful indexing-based query
+ acceleration. http://www.tokutek.com/products/tokudb-for-mysql/
diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.files b/debian/dist/Ubuntu/mariadb-server-5.5.files
index d201577f7cf..c747d4d64db 100644
--- a/debian/dist/Ubuntu/mariadb-server-5.5.files
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.files
@@ -1,4 +1,12 @@
-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 2852864c5a0..493381b019b 100755
--- a/debian/dist/Ubuntu/rules
+++ b/debian/dist/Ubuntu/rules
@@ -206,7 +206,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
diff --git a/debian/libmariadbclient18.files b/debian/libmariadbclient18.files
index 5162b7b9639..75020ecbd16 100644
--- a/debian/libmariadbclient18.files
+++ b/debian/libmariadbclient18.files
@@ -1 +1,3 @@
 usr/lib/libmysqlclient*.so.*
+usr/lib/mysql/plugin/mysql_clear_password.so
+usr/lib/mysql/plugin/dialog.so
diff --git a/debian/mariadb-test-5.5.dirs b/debian/mariadb-test-5.5.dirs
index 2c10b45efba..f45bf43f7e9 100644
--- a/debian/mariadb-test-5.5.dirs
+++ b/debian/mariadb-test-5.5.dirs
@@ -67,9 +67,6 @@ usr/share/mysql/mysql-test/suite/ndb_team
 usr/share/mysql/mysql-test/suite/ndb_team/t
 usr/share/mysql/mysql-test/suite/ndb_team/r
 usr/share/mysql/mysql-test/suite/federated
-usr/share/mysql/mysql-test/suite/pbxt
-usr/share/mysql/mysql-test/suite/pbxt/t
-usr/share/mysql/mysql-test/suite/pbxt/r
 usr/share/mysql/mysql-test/suite/funcs_1
 usr/share/mysql/mysql-test/suite/funcs_1/cursors
 usr/share/mysql/mysql-test/suite/funcs_1/bitdata
diff --git a/debian/mariadb-test-5.5.files b/debian/mariadb-test-5.5.files
index ac4fc1c4fca..b95f8e0b51c 100644
--- a/debian/mariadb-test-5.5.files
+++ b/debian/mariadb-test-5.5.files
@@ -1,3 +1,13 @@
+usr/lib/mysql/plugin/dialog_examples.so
+usr/lib/mysql/plugin/auth_test_plugin.so
+usr/lib/mysql/plugin/qa_auth_interface.so
+usr/lib/mysql/plugin/qa_auth_server.so
+usr/lib/mysql/plugin/qa_auth_client.so
+usr/lib/mysql/plugin/auth_0x0100.so
+usr/lib/mysql/plugin/mypluglib.so
+usr/lib/mysql/plugin/daemon_example.ini
+usr/lib/mysql/plugin/libdaemon_example.so
+usr/lib/mysql/plugin/adt_null.so
 usr/bin/mysql_client_test
 usr/bin/mysql_client_test_embedded
 usr/bin/mysqltest_embedded
diff --git a/debian/mariadb-tokudb-engine-5.5.files b/debian/mariadb-tokudb-engine-5.5.files
new file mode 100644
index 00000000000..2dc9f22d77a
--- /dev/null
+++ b/debian/mariadb-tokudb-engine-5.5.files
@@ -0,0 +1,5 @@
+etc/mysql/conf.d/tokudb.cnf
+usr/bin/tokuftdump
+usr/lib/mysql/plugin/ha_tokudb.so
+usr/share/doc/mariadb-tokudb-engine-5.5/README-TOKUDB
+usr/share/doc/mariadb-tokudb-engine-5.5/README.md