[Apachetoolbox-commit] Apachetoolbox/bin/sql mysql,1.3,1.4

[Kevin J. M. Jr. <nir...@us...>]

Update of /cvsroot/apachetoolbox/Apachetoolbox/bin/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9985/bin/sql

Modified Files:
	mysql 
Log Message:
Added a patch for the Apache source code to fix a bug that is messing up some modules.  Fix for MySQL script bug.


Index: mysql
===================================================================
RCS file: /cvsroot/apachetoolbox/Apachetoolbox/bin/sql/mysql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mysql	2 Nov 2003 16:03:58 -0000	1.3
--- mysql	5 Oct 2004 18:37:39 -0000	1.4
***************
*** 4,13 ****
  notice "$MENUTRUE" "Setting up MySQL...\n"  
  
!   test -x /usr/local/bin/safe_mysqld && MYSQLD=/usr/local/bin/safe_mysqld
!   test -x /usr/bin/safe_mysqld && MYSQLD=/usr/bin/safe_mysqld
!   test -x /opt/mysql/bin/safe_mysqld && MYSQLD=/opt/mysql/bin/safe_mysqld
!   test -x /usr/local/mysql/bin/safe_mysqld && MYSQLD=/usr/local/mysql/bin/safe_mysqld
!   test -x $LOCAL_PATH/bin/safe_mysqld && MYSQLD=$LOCAL_PATH/bin/safe_mysqld
!   test -x $LOCAL_PATH/mysql/bin/safe_mysqld && MYSQLD=$LOCAL_PATH/mysql/bin/safe_mysqld
  
  if [ ! -x "$MYSQLD" ];then
--- 4,13 ----
  notice "$MENUTRUE" "Setting up MySQL...\n"  
  
!   test -x /usr/local/bin/safe_mysqld && MYSQLD=/usr/local/bin/mysqld_safe
!   test -x /usr/bin/mysqld_safe && MYSQLD=/usr/bin/mysqld_safe
!   test -x /opt/mysql/bin/mysqld_safe && MYSQLD=/opt/mysql/bin/mysqld_safe
!   test -x /usr/local/mysql/bin/mysqld_safe && MYSQLD=/usr/local/mysql/bin/mysqld_safe
!   test -x $LOCAL_PATH/bin/mysqld_safe && MYSQLD=$LOCAL_PATH/bin/mysqld_safe
!   test -x $LOCAL_PATH/mysql/bin/mysqld_safe && MYSQLD=$LOCAL_PATH/mysql/bin/mysqld_safe
  
  if [ ! -x "$MYSQLD" ];then
***************
*** 183,187 ****
    notice "$MENUFALSE" "MySQL failed to start, exiting.\n\n"
    echo
!   notice "$MENUFALSE" "Test \"${MYSQLPREFIX}/bin/safe_mysqld --user=$MYSQLUSER &\"...\n";
    exit 1
   fi
--- 183,187 ----
    notice "$MENUFALSE" "MySQL failed to start, exiting.\n\n"
    echo
!   notice "$MENUFALSE" "Test \"${MYSQLPREFIX}/bin/mysqld_safe --user=$MYSQLUSER &\"...\n";
    exit 1
   fi