diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-18 17:15:57 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-18 17:15:57 -0500 |
| commit | 3c9137deeb84dff9fa52734fb5fc3966c6746c00 (patch) | |
| tree | 3ce5922ee55d6683c2348e1b1772d961754d1cd6 /debian | |
| parent | d8ee54c63321e81ef99465bbadc8e4fb45fe7569 (diff) | |
| parent | fdd6c111c254c5044cd9b6c2f7e4d0c74f427a79 (diff) | |
| download | mariadb-git-3c9137deeb84dff9fa52734fb5fc3966c6746c00.tar.gz | |
Merge branch '5.5' into 5.5-galera
Merge banch 5.5 till revision :
fdd6c11 - MDEV-7419 Function cli_safe_read not exported
Conflicts:
.bzrignore
debian/dist/Debian/mariadb-galera-server-5.5.files.in
debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
storage/tokudb/CMakeLists.txt
support-files/build-tags
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/dist/Debian/mariadb-galera-server-5.5.files.in | 2 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in | 2 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-galera-server-5.5.postinst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/dist/Debian/mariadb-galera-server-5.5.files.in b/debian/dist/Debian/mariadb-galera-server-5.5.files.in index b7be2c77634..a5fda79edd5 100644 --- a/debian/dist/Debian/mariadb-galera-server-5.5.files.in +++ b/debian/dist/Debian/mariadb-galera-server-5.5.files.in @@ -1,6 +1,5 @@ usr/sbin/mysqld usr/lib/mysql/plugin/ha_innodb.so -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 @@ -105,5 +104,6 @@ usr/share/mysql/mysql_system_tables.sql usr/share/mysql/mysql_performance_tables.sql usr/share/mysql/mysql_test_data_timezone.sql @TOKUDB_DEB_FILES@ +@OQGRAPH_DEB_FILES@ usr/share/mysql/wsrep.cnf usr/share/mysql/wsrep_notify diff --git a/debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in b/debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in index 308710858d7..c333e85c784 100644 --- a/debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in +++ b/debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in @@ -1,6 +1,5 @@ usr/sbin/mysqld usr/lib/mysql/plugin/ha_innodb.so -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 @@ -107,5 +106,6 @@ usr/share/mysql/mysql_system_tables.sql usr/share/mysql/mysql_performance_tables.sql usr/share/mysql/mysql_test_data_timezone.sql @TOKUDB_DEB_FILES@ +@OQGRAPH_DEB_FILES@ usr/share/mysql/wsrep.cnf usr/share/mysql/wsrep_notify diff --git a/debian/dist/Ubuntu/mariadb-galera-server-5.5.postinst b/debian/dist/Ubuntu/mariadb-galera-server-5.5.postinst index 1c7aa37f69f..920868e22e6 100644 --- a/debian/dist/Ubuntu/mariadb-galera-server-5.5.postinst +++ b/debian/dist/Ubuntu/mariadb-galera-server-5.5.postinst @@ -213,7 +213,7 @@ EOF # admin might already have chosen to remove one or more plugins. Newlines are necessary. install_plugins=`/bin/echo -e \ "USE mysql;\n" \ - "CREATE TABLE plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ + "CREATE TABLE IF NOT EXISTS plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ " dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \ " PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';" ` |