Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:53:49 JST 2012
Kouhei Sutou 2012-06-11 16:39:41 +0900 (Mon, 11 Jun 2012) New Revision: 3b24a4dd3a35bb36bf800a8674e5fe7662506371 https://github.com/mroonga/mroonga/commit/3b24a4dd3a35bb36bf800a8674e5fe7662506371 Log: package: ensure deleting mroonga plugin from mysql.plugin before install [groonga-dev,00948] Suggested by Kazuhiro Isobe. Thanks!!! Modified files: packages/debian/changelog packages/debian/mysql-server-mroonga.postinst packages/rpm/centos/mysql-mroonga.spec.in packages/rpm/fedora/mysql-mroonga.spec.in Modified: packages/debian/changelog (+2 -0) =================================================================== --- packages/debian/changelog 2012-06-11 16:33:06 +0900 (39f1974) +++ packages/debian/changelog 2012-06-11 16:39:41 +0900 (9329772) @@ -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 Modified: packages/debian/mysql-server-mroonga.postinst (+1 -0) =================================================================== --- packages/debian/mysql-server-mroonga.postinst 2012-06-11 16:33:06 +0900 (2608c80) +++ packages/debian/mysql-server-mroonga.postinst 2012-06-11 16:39:41 +0900 (689134c) @@ -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 Modified: packages/rpm/centos/mysql-mroonga.spec.in (+3 -0) =================================================================== --- packages/rpm/centos/mysql-mroonga.spec.in 2012-06-11 16:33:06 +0900 (f0b862f) +++ packages/rpm/centos/mysql-mroonga.spec.in 2012-06-11 16:39:41 +0900 (bd9e81e) @@ -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. Modified: packages/rpm/fedora/mysql-mroonga.spec.in (+3 -0) =================================================================== --- packages/rpm/fedora/mysql-mroonga.spec.in 2012-06-11 16:33:06 +0900 (7d7806c) +++ packages/rpm/fedora/mysql-mroonga.spec.in 2012-06-11 16:39:41 +0900 (37ec8bd) @@ -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. -------------- next part -------------- HTML����������������������������...Download