OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   16-Jan-2003 19:25:52
  Branch: HEAD                             Handle: 2003011618255100

  Modified files:
    openpkg-src/mysql4      my.cnf rc.mysql4

  Log:
    fix config file and start script

  Summary:
    Revision    Changes     Path
    1.2         +6  -6      openpkg-src/mysql4/my.cnf
    1.2         +8  -8      openpkg-src/mysql4/rc.mysql4
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql4/my.cnf
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 my.cnf
  --- openpkg-src/mysql4/my.cnf 16 Jan 2003 15:02:07 -0000      1.1
  +++ openpkg-src/mysql4/my.cnf 16 Jan 2003 18:25:51 -0000      1.2
  @@ -3,21 +3,21 @@
   ##
   
   [client]
  -socket       = @l_prefix@/var/mysql/mysql.sock
  +socket       = @l_prefix@/var/mysql4/mysql.sock
   port         = 3306
   
   [safe_mysqld]
  -datadir      = @l_prefix@/var/mysql
  -socket       = @l_prefix@/var/mysql/mysql.sock
  -set-variable = pid_file=@l_prefix@/var/mysql/mysqld.pid
  +datadir      = @l_prefix@/var/mysql4
  +socket       = @l_prefix@/var/mysql4/mysql.sock
  +set-variable = pid_file=@l_prefix@/var/mysql4/mysqld.pid
   host         = 127.0.0.1
   port         = 3306
   user         = @l_rusr@
   basedir      = @l_prefix@
   
   #   logfile destinations (update rc.mysql accordingly)
  -log          = @l_prefix@/var/mysql/common.log
  -log-update   = @l_prefix@/var/mysql/update.log
  +log          = @l_prefix@/var/mysql4/common.log
  +log-update   = @l_prefix@/var/mysql4/update.log
   
   #   most important tuning parameters for mysqld
   set-variable = key_buffer_size=16M
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql4/rc.mysql4
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 rc.mysql4
  --- openpkg-src/mysql4/rc.mysql4      16 Jan 2003 15:02:07 -0000      1.1
  +++ openpkg-src/mysql4/rc.mysql4      16 Jan 2003 18:25:51 -0000      1.2
  @@ -5,8 +5,8 @@
   
   %config
       mysql_enable="yes"
  -    mysql_pwd_file=@l_prefix@/etc/mysql/my.pwd
  -    mysql_cnf_file=@l_prefix@/etc/mysql/my.cnf
  +    mysql_pwd_file=@l_prefix@/etc/mysql4/my.pwd
  +    mysql_cnf_file=@l_prefix@/etc/mysql4/my.cnf
       mysql_log_prolog="true"
       mysql_log_epilog="true"
       mysql_log_numfiles="10"
  @@ -15,15 +15,15 @@
   
   %common
       #   same paths as in my.cnf
  -    mysql_pid_file=@l_prefix@/var/mysql/mysqld.pid
  -    mysql_log_err=@l_prefix@/var/mysql/mysqld.err
  -    mysql_log_common=@l_prefix@/var/mysql/common.log
  -    mysql_log_update=@l_prefix@/var/mysql/update.log
  +    mysql_pid_file=@l_prefix@/var/mysql4/mysqld.pid
  +    mysql_log_err=@l_prefix@/var/mysql4/mysqld.err
  +    mysql_log_common=@l_prefix@/var/mysql4/common.log
  +    mysql_log_update=@l_prefix@/var/mysql4/update.log
   
   %start -p 200 -u @l_rusr@
       opServiceEnabled mysql || exit 0
       cd @l_prefix@
  -    @l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
  +    @l_prefix@/bin/mysqld_safe >/dev/null 2>&1 \
           --mysqld=@mysqld@ \
           --pid-file="$mysql_pid_file" \
           --err-log="$mysql_log_err" &
  @@ -40,7 +40,7 @@
       @l_prefix@/bin/mysqladmin \
           --defaults-extra-file=${mysql_pwd_file} \
           shutdown
  -    @l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
  +    @l_prefix@/bin/mysql_safe >/dev/null 2>&1 \
           --mysqld=@mysqld@ \
           --pid-file="$mysql_pid_file" \
           --err-log="$mysql_log_err" &
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to