package: ensure deleting mroonga plugin from mysql.plugin before install

[groonga-dev,00948] Suggested by Kazuhiro Isobe. Thanks!!!
mroonga · Jun 11, 2012 · 3b24a4d · 3b24a4d
1 parent 5b3d88d
commit 3b24a4d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/packages/debian/changelog b/packages/debian/changelog
@@ -1,6 +1,8 @@
 mroonga (2.04-1) unstable; urgency=low
 
   * New upstream release.
+  * Ensure deleting mroonga plugin before install.
+    Suggested by Kazuhiro Isobe. Thanks!!!
 
  -- Kouhei Sutou <kou@clear-code.com>  Fri, 29 Jun 2012 00:00:00 +0900
 

diff --git a/packages/debian/mysql-server-mroonga.postinst b/packages/debian/mysql-server-mroonga.postinst
@@ -6,6 +6,7 @@ prevver="$2"
 
 install_plugin() {
     cat <<EOS | mysql --defaults-file=/etc/mysql/debian.cnf || true
+DELETE IGNORE FROM mysql.plugin WHERE name = 'mroonga';
 INSTALL PLUGIN mroonga SONAME 'ha_mroonga.so';
 CREATE FUNCTION last_insert_grn_id RETURNS INTEGER soname 'ha_mroonga.so';
 EOS

diff --git a/packages/rpm/centos/mysql-mroonga.spec.in b/packages/rpm/centos/mysql-mroonga.spec.in
@@ -131,6 +131,7 @@ if [ "$1" = 2 ] ; then
            echo "  $command")
 fi
 sql="
+DELETE IGNORE FROM mysql.plugin WHERE name = 'mroonga';
 INSTALL PLUGIN mroonga SONAME 'ha_mroonga.so';
 CREATE FUNCTION last_insert_grn_id RETURNS INTEGER soname 'ha_mroonga.so';
 "
@@ -168,6 +169,8 @@ fi
 %changelog
 * Fri Jun 29 2012 Kouhei Sutou <kou@clear-code.com> - 2.04-0
 - new upstream release.
+- ensure deleting mroonga plugin before install.
+  Suggested by Kazuhiro Isobe. Thanks!!!
 
 * Tue May 29 2012 Kouhei Sutou <kou@clear-code.com> - 2.03-0
 - new upstream release.

diff --git a/packages/rpm/fedora/mysql-mroonga.spec.in b/packages/rpm/fedora/mysql-mroonga.spec.in
@@ -79,6 +79,7 @@ if [ "$1" = 2 ] ; then
            echo "  $command")
 fi
 sql="
+DELETE IGNORE FROM mysql.plugin WHERE name = 'mroonga';
 INSTALL PLUGIN mroonga SONAME 'ha_mroonga.so';
 CREATE FUNCTION last_insert_grn_id RETURNS INTEGER soname 'ha_mroonga.so';
 
@@ -117,6 +118,8 @@ fi
 %changelog
 * Fri Jun 29 2012 Kouhei Sutou <kou@clear-code.com> - 2.04-0
 - new upstream release.
+- ensure deleting mroonga plugin before install.
+  Suggested by Kazuhiro Isobe. Thanks!!!
 
 * Tue May 29 2012 Kouhei Sutou <kou@clear-code.com> - 2.03-0
 - new upstream release.