diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-03-13 16:43:11 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-03-13 16:43:11 +0200 |
| commit | e63c03db8d620765b7a1bc769150a04a230b9353 (patch) | |
| tree | 889476c5e3cf759c2abde780f91e1c61c3064492 /debian | |
| parent | 70c08df4dc6899991c29c4db3253d8e4efc4ee77 (diff) | |
| parent | 172784965981c7d06ddb50457f0178da25104b9e (diff) | |
| download | mariadb-git-e63c03db8d620765b7a1bc769150a04a230b9353.tar.gz | |
Merge with 10.0-base
Automatic merge, except for server_audit.cc that had to be modified slightly
Changes to xtradb and innobase where ignored was these made no sence for 10.0
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/dist/Debian/mariadb-server-10.0.files.in | 1 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-server-10.0.files.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/dist/Debian/mariadb-server-10.0.files.in b/debian/dist/Debian/mariadb-server-10.0.files.in index f9f4e342c69..c56816fb3ba 100644 --- a/debian/dist/Debian/mariadb-server-10.0.files.in +++ b/debian/dist/Debian/mariadb-server-10.0.files.in @@ -11,6 +11,7 @@ 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/sql_errlog.so +usr/lib/mysql/plugin/server_audit.so usr/lib/libhsclient.so.* etc/mysql/debian-start etc/mysql/conf.d/mysqld_safe_syslog.cnf diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files.in b/debian/dist/Ubuntu/mariadb-server-10.0.files.in index 5c073f14e0d..f489b29081e 100644 --- a/debian/dist/Ubuntu/mariadb-server-10.0.files.in +++ b/debian/dist/Ubuntu/mariadb-server-10.0.files.in @@ -11,6 +11,7 @@ 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/sql_errlog.so +usr/lib/mysql/plugin/server_audit.so usr/lib/libhsclient.so.* etc/apparmor.d/usr.sbin.mysqld usr/share/apport/package-hooks/source_mariadb-10.0.py |