diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index a8097f03824797e8c4262120c2b3a3a493686338..fec266d8f3b636fa7e54108b60d23b48463333c1 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -103,7 +103,12 @@ ELSEIF(DEB) SET(WITH_SSL system CACHE STRING "") SET(WITH_ZLIB system CACHE STRING "") SET(WITH_LIBWRAP ON) - SET(WITH_MAX ON) + # Note, CONNECT engine should not be compiled statically + # because it requires unixODBC and libxml2 as dependencies + SET(WITH_ARCHIVE 1) + SET(WITH_BLACKHOLE 1) + SET(WITH_FEDERATEDX 1) + SET(WITH_SPHINX 1) SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON) ELSE() SET(WITH_SSL bundled CACHE STRING "") diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index 56ba509cfd7b79401dbfad075236b57c53596c95..c1e085bcc5ce25d7695d736d5f62c33fa45fdd9c 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -235,3 +235,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-10.0), as determined by the MariaDB maintainers. + +Package: mariadb-connect-engine-10.0 +Section: database +Architecture: all +Depends: mariadb-server-10.0, unixODBC-dev, libxml2-dev +Description: Connect storage engine for MariaDB + Connect engine supports a number of file formats (dbf, xml, txt, bin, etc), + connections to ODBC tables and remote MySQL tables, as well as a number of + other interesting features. diff --git a/debian/dist/Debian/mariadb-server-10.0.files b/debian/dist/Debian/mariadb-server-10.0.files index 6cb4d764660d8cc673a9cd0680d3f5f2c411d2cb..86522ac09ca08a2e99a36099b3a6cdcde2fac503 100644 --- a/debian/dist/Debian/mariadb-server-10.0.files +++ b/debian/dist/Debian/mariadb-server-10.0.files @@ -1,4 +1,20 @@ -usr/lib/mysql/plugin/ +usr/lib/mysql/plugin/adt_null.so +usr/lib/mysql/plugin/auth_pam.so +usr/lib/mysql/plugin/auth_socket.so +usr/lib/mysql/plugin/auth_test_plugin.so +usr/lib/mysql/plugin/daemon_example.ini +usr/lib/mysql/plugin/dialog_examples.so +usr/lib/mysql/plugin/dialog.so +usr/lib/mysql/plugin/handlersocket.so +usr/lib/mysql/plugin/libdaemon_example.so +usr/lib/mysql/plugin/mypluglib.so +usr/lib/mysql/plugin/mysql_clear_password.so +usr/lib/mysql/plugin/qa_auth_client.so +usr/lib/mysql/plugin/qa_auth_interface.so +usr/lib/mysql/plugin/qa_auth_server.so +usr/lib/mysql/plugin/semisync_master.so +usr/lib/mysql/plugin/semisync_slave.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/Ubuntu/control b/debian/dist/Ubuntu/control index d9d5d6fbe1bb6dc00426b94092c5237d24605adb..093e2577299f4d22c9b01732aadffb552caf7a92 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -229,3 +229,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-10.0), as determined by the MariaDB maintainers. + +Package: mariadb-connect-engine-10.0 +Section: database +Architecture: all +Depends: mariadb-server-10.0, unixODBC-dev, libxml2-dev +Description: Connect storage engine for MariaDB + Connect engine supports a number of file formats (dbf, xml, txt, bin, etc), + connections to ODBC tables and remote MySQL tables, as well as a number of + other interesting features. diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files b/debian/dist/Ubuntu/mariadb-server-10.0.files index 6054ad2d1c50245526df79eb62f759c00c6ab0b5..161e89da8acfbd8fca81a9bfd838f00c1edaefa0 100644 --- a/debian/dist/Ubuntu/mariadb-server-10.0.files +++ b/debian/dist/Ubuntu/mariadb-server-10.0.files @@ -1,4 +1,20 @@ -usr/lib/mysql/plugin/ +usr/lib/mysql/plugin/adt_null.so +usr/lib/mysql/plugin/auth_pam.so +usr/lib/mysql/plugin/auth_socket.so +usr/lib/mysql/plugin/auth_test_plugin.so +usr/lib/mysql/plugin/daemon_example.ini +usr/lib/mysql/plugin/dialog_examples.so +usr/lib/mysql/plugin/dialog.so +usr/lib/mysql/plugin/handlersocket.so +usr/lib/mysql/plugin/libdaemon_example.so +usr/lib/mysql/plugin/mypluglib.so +usr/lib/mysql/plugin/mysql_clear_password.so +usr/lib/mysql/plugin/qa_auth_client.so +usr/lib/mysql/plugin/qa_auth_interface.so +usr/lib/mysql/plugin/qa_auth_server.so +usr/lib/mysql/plugin/semisync_master.so +usr/lib/mysql/plugin/semisync_slave.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-10.0.py diff --git a/debian/mariadb-connect-engine-10.0.files b/debian/mariadb-connect-engine-10.0.files new file mode 100644 index 0000000000000000000000000000000000000000..f28377aea381f15f23b7952e38ae3e532b38fc0d --- /dev/null +++ b/debian/mariadb-connect-engine-10.0.files @@ -0,0 +1 @@ +usr/lib/mysql/plugin/ha_connect.so