- fix mysql 4.1.1 migration trigger where one has leading space in cluster definition

[packages/mysql.git] / mysql-noproc.patch

diff --git a/mysql-noproc.patch b/mysql-noproc.patch
index a84c042cb63d53dc944e8a86be91fcb89ce178b2..90b7878aaa7a349cbc47fb0f936a03d6655c5a24 100644 (file)
--- a/mysql-noproc.patch
+++ b/mysql-noproc.patch
@@ -1,21 +1,33 @@
---- mysql-3.23.49/configure.in.orig    Sun May 19 11:05:42 2002
-+++ mysql-3.23.49/configure.in Sun May 19 11:05:56 2002
-@@ -362,7 +362,7 @@
- AC_SUBST(PERL)
- AC_SUBST(PERL5)
- 
--# Lock for PS
-+# Look for PS
+--- mysql-4.0.13/configure.in.orig     Fri Jul 11 11:59:51 2003
++++ mysql-4.0.13/configure.in  Fri Jul 11 14:06:50 2003
+@@ -431,6 +431,7 @@
+ # Lock for PS
  AC_PATH_PROG(PS, ps, ps)
  AC_MSG_CHECKING("how to check if pid exists")
++if test -z "$FIND_PROC"; then
  PS=$ac_cv_path_PS
-@@ -394,6 +394,9 @@
-     *cygwin*)
-       FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
-       ;;
-+    *linux*)
-+      FIND_PROC="$PS -p \$\$PID \" > /dev/null"
-+      ;;
-     *)
+ # Linux style
+ if $PS p $$ 2> /dev/null | grep $0 > /dev/null
+@@ -467,12 +468,14 @@
        AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
    esac
+ fi
++fi
+ AC_SUBST(FIND_PROC)
+ AC_MSG_RESULT("$FIND_PROC")
+ 
+ # Check if a pid is valid
+ AC_PATH_PROG(KILL, kill, kill)
+ AC_MSG_CHECKING("for kill switches")
++if test -z "$CHECK_PID"; then
+ if $ac_cv_path_KILL -0 $$
+ then
+   CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
+@@ -483,6 +486,7 @@
+   AC_MSG_WARN([kill -0 to check for pid seems to fail])
+     CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
+ fi
++fi
+ AC_SUBST(CHECK_PID)
+ AC_MSG_RESULT("$CHECK_PID")
+