10.0-base merge

6 files changed, 11 insertions, 28 deletions

diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index d1aefdb53d6..3ee877af482 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -15,7 +15,7 @@ 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-10.0"
+#export MARIADB_OPTIONAL_DEBS="tokudb-engine"
 
 # Find major.minor version.
 #
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index e4c5352b40d..e9732ced10d 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -191,12 +191,13 @@ Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
 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,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
+    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
-    libmariadbclient16 (<< 5.3.4),
-    libmariadbclient-dev (<< 5.5.0)
+    libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
+    mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Description: MariaDB database server binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -249,11 +250,3 @@ Description: Connect storage engine for MariaDB
  connections to ODBC tables and remote MySQL tables, as well as a number of
  other interesting features.
 
-Package: mariadb-tokudb-engine-10.0
-Section: database
-Architecture: any
-Depends: mariadb-server-10.0
-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-10.0.files.in b/debian/dist/Debian/mariadb-server-10.0.files.in
index 506b9da3bc3..3bf53268728 100644
--- a/debian/dist/Debian/mariadb-server-10.0.files.in
+++ b/debian/dist/Debian/mariadb-server-10.0.files.in
@@ -73,3 +73,4 @@ usr/share/mysql/mysql_test_data_timezone.sql
 @CASSANDRA_DEB_FILES@
 @OQGRAPH_DEB_FILES@
 @SPIDER_DEB_FILES@
+@TOKUDB_DEB_FILES@
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 032bcc183df..7b91b0e85dc 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -185,12 +185,13 @@ Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
 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,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
+    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
-    libmariadbclient16 (<< 5.3.4),
-    libmariadbclient-dev (<< 5.5.0)
+    libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
+    mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Description: MariaDB database server binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -243,11 +244,3 @@ Description: Connect storage engine for MariaDB
  connections to ODBC tables and remote MySQL tables, as well as a number of
  other interesting features.
 
-Package: mariadb-tokudb-engine-10.0
-Section: database
-Architecture: any
-Depends: mariadb-server-10.0
-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-10.0.files.in b/debian/dist/Ubuntu/mariadb-server-10.0.files.in
index 87c3eee67c2..b83fedce12a 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.files.in
+++ b/debian/dist/Ubuntu/mariadb-server-10.0.files.in
@@ -75,3 +75,4 @@ usr/share/mysql/mysql_test_data_timezone.sql
 @CASSANDRA_DEB_FILES@
 @OQGRAPH_DEB_FILES@
 @SPIDER_DEB_FILES@
+@TOKUDB_DEB_FILES@
diff --git a/debian/mariadb-tokudb-engine-10.0.files b/debian/mariadb-tokudb-engine-10.0.files
deleted file mode 100644
index a0690e6d1c2..00000000000
--- a/debian/mariadb-tokudb-engine-10.0.files
+++ /dev/null
@@ -1,5 +0,0 @@
-etc/mysql/conf.d/tokudb.cnf
-usr/bin/tokuftdump
-usr/lib/mysql/plugin/ha_tokudb.so
-usr/share/doc/mariadb-tokudb-engine-10.0/README-TOKUDB
-usr/share/doc/mariadb-tokudb-engine-10.0/README.md