diff options
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 2 | ||||
| -rw-r--r-- | debian/dist/Debian/mariadb-server-10.0.files.in | 12 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-server-10.0.files.in | 12 | ||||
| -rw-r--r-- | debian/mariadb-test-10.0.files | 1 |
4 files changed, 18 insertions, 9 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index cfcd971f900..548e81eb46b 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -84,7 +84,7 @@ IF(FEATURE_SET) # Update cache with current values, remove engines we do not care about # from build. - FOREACH(eng ARCHIVE BLACKHOLE FEDERATED INNOBASE PARTITION EXAMPLE) + FOREACH(eng ARCHIVE BLACKHOLE FEDERATED INNOBASE PARTITION) IF(NOT WITH_${eng}_STORAGE_ENGINE) SET(WITHOUT_${eng}_STORAGE_ENGINE ON CACHE BOOL "") MARK_AS_ADVANCED(WITHOUT_${eng}_STORAGE_ENGINE) diff --git a/debian/dist/Debian/mariadb-server-10.0.files.in b/debian/dist/Debian/mariadb-server-10.0.files.in index 3bf53268728..8b98c7e9433 100644 --- a/debian/dist/Debian/mariadb-server-10.0.files.in +++ b/debian/dist/Debian/mariadb-server-10.0.files.in @@ -1,10 +1,14 @@ -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/auth_socket.so +usr/lib/mysql/plugin/ha_sequence.so +usr/lib/mysql/plugin/ha_sphinx.so +usr/lib/mysql/plugin/handlersocket.so +usr/lib/mysql/plugin/locales.so +usr/lib/mysql/plugin/query_cache_info.so +usr/lib/mysql/plugin/query_response_time.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/sphinx.so usr/lib/mysql/plugin/sql_errlog.so usr/lib/libhsclient.so.* etc/mysql/debian-start diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files.in b/debian/dist/Ubuntu/mariadb-server-10.0.files.in index b83fedce12a..8e390e73db9 100644 --- a/debian/dist/Ubuntu/mariadb-server-10.0.files.in +++ b/debian/dist/Ubuntu/mariadb-server-10.0.files.in @@ -1,10 +1,14 @@ -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/auth_socket.so +usr/lib/mysql/plugin/ha_sequence.so +usr/lib/mysql/plugin/ha_sphinx.so +usr/lib/mysql/plugin/handlersocket.so +usr/lib/mysql/plugin/locales.so +usr/lib/mysql/plugin/query_cache_info.so +usr/lib/mysql/plugin/query_response_time.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/sphinx.so usr/lib/mysql/plugin/sql_errlog.so usr/lib/libhsclient.so.* etc/apparmor.d/usr.sbin.mysqld diff --git a/debian/mariadb-test-10.0.files b/debian/mariadb-test-10.0.files index b95f8e0b51c..a1c0d5af54e 100644 --- a/debian/mariadb-test-10.0.files +++ b/debian/mariadb-test-10.0.files @@ -5,6 +5,7 @@ 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/ha_test_sql_discovery.so usr/lib/mysql/plugin/daemon_example.ini usr/lib/mysql/plugin/libdaemon_example.so usr/lib/mysql/plugin/adt_null.so |