diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-18 18:07:45 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-18 18:07:45 -0500 |
| commit | 860576f4161ab0ea29bf7ecf6dee0e9d10b6fed6 (patch) | |
| tree | 4e3298fd280e7e1e3aca5716c0b93f95f636ac4c /debian/dist/Debian/mariadb-galera-server-10.0.files.in | |
| parent | cd187ecf90e9988e5a729a1a4db7239e3baa2e6c (diff) | |
| parent | f37bdd9c1a29865574b10fe7d21164ee7cae4d19 (diff) | |
| download | mariadb-git-860576f4161ab0ea29bf7ecf6dee0e9d10b6fed6.tar.gz | |
Merge branch '10.0' into 10.0-galera
Merge branch 10.0 till revision:
f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0
Conflicts:
.bzrignore
storage/xtradb/CMakeLists.txt
Diffstat (limited to 'debian/dist/Debian/mariadb-galera-server-10.0.files.in')
| -rw-r--r-- | debian/dist/Debian/mariadb-galera-server-10.0.files.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/dist/Debian/mariadb-galera-server-10.0.files.in b/debian/dist/Debian/mariadb-galera-server-10.0.files.in index bf1b04b5787..fd914e77e7f 100644 --- a/debian/dist/Debian/mariadb-galera-server-10.0.files.in +++ b/debian/dist/Debian/mariadb-galera-server-10.0.files.in @@ -2,6 +2,7 @@ usr/sbin/mysqld usr/lib/mysql/plugin/auth_pam.so usr/lib/mysql/plugin/auth_socket.so usr/lib/mysql/plugin/ha_mroonga.so +usr/lib/mysql/plugin/ha_oqgraph.so usr/lib/mysql/plugin/ha_sequence.so usr/lib/mysql/plugin/ha_sphinx.so usr/lib/mysql/plugin/ha_innodb.so @@ -14,6 +15,7 @@ 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/mysql/plugin/sphinx.so usr/lib/libhsclient.so.* etc/mysql/debian-start etc/mysql/conf.d/mysqld_safe_syslog.cnf |