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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   12-Oct-2006 08:04:31
  Branch: HEAD                             Handle: 2006101207043100

  Modified files:
    openpkg-src/mysql51     my.cnf mysql51.spec rc.mysql

  Log:
    port forward support for CSV storage engine; port forward rc fixes;
    move innobase option to top as it is enabled by default (so it looks
    more as intended to be enabled by default than by accident);
    compactify the my.cnf even more

  Summary:
    Revision    Changes     Path
    1.4         +1  -7      openpkg-src/mysql51/my.cnf
    1.5         +8  -2      openpkg-src/mysql51/mysql51.spec
    1.4         +3  -3      openpkg-src/mysql51/rc.mysql
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql51/my.cnf
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 my.cnf
  --- openpkg-src/mysql51/my.cnf        11 Oct 2006 21:31:50 -0000      1.3
  +++ openpkg-src/mysql51/my.cnf        12 Oct 2006 06:04:31 -0000      1.4
  @@ -18,11 +18,8 @@
   #log-bin                         = @l_prefix@/var/mysql/binary.log
   #server-id                       = 1
   
  -#   most important tuning parameters
   key_buffer_size                  = 64M
   table_cache                      = 256
  -
  -#   less important tuning parameters
   join_buffer_size                 = 1M
   max_connections                  = 1000
   max_connect_errors               = 10
  @@ -34,15 +31,12 @@
   sort_buffer                      = 4M
   key_buffer                       = 1M
   tmp_table_size                   = 32M
  -ft_min_word_len                  = 3
  -
  -#   query cache
   query_cache_type                 = 1
   query_cache_limit                = 1M
   query_cache_size                 = 32M
  +ft_min_word_len                  = 3
   
   <with_innobase>
  -#   Innobase DB storage engine
   innodb_buffer_pool_size          = 70M
   innodb_additional_mem_pool_size  = 2M
   innodb_log_files_in_group        = 3
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql51/mysql51.spec
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 mysql51.spec
  --- openpkg-src/mysql51/mysql51.spec  11 Oct 2006 18:29:02 -0000      1.4
  +++ openpkg-src/mysql51/mysql51.spec  12 Oct 2006 06:04:31 -0000      1.5
  @@ -39,16 +39,17 @@
   Group:        Database
   License:      GPL
   Version:      %{V_opkg}
  -Release:      20061011
  +Release:      20061012
   
   #   package options
   %option       with_server      yes
  +%option       with_innobase    yes
   %option       with_archive     no
   %option       with_blackhole   no
   %option       with_federated   no
  -%option       with_innobase    yes
   %option       with_ndbcluster  no
   %option       with_partition   no
  +%option       with_csv         no
   %option       with_ssl         no
   %option       with_embedded    no
   
  @@ -166,6 +167,11 @@
   %else
           --without-plugin-partition \
   %endif
  +%if "%{with_csv}" == "yes"
  +        --with-plugin-csv \
  +%else
  +        --without-plugin-csv \
  +%endif
   %endif
           --with-zlib-dir=%{l_prefix} \
   %if "%{with_ssl}" == "yes"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql51/rc.mysql
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 rc.mysql
  --- openpkg-src/mysql51/rc.mysql      11 Oct 2006 18:29:02 -0000      1.3
  +++ openpkg-src/mysql51/rc.mysql      12 Oct 2006 06:04:31 -0000      1.4
  @@ -23,10 +23,10 @@
       [EMAIL PROTECTED]@/var/mysql/mysqld.err
       [EMAIL PROTECTED]@/var/mysql/common.log
   
  -%status -u @l_rusr@ -o
  +%status -u @l_susr@ -o
       mysql_usable="unknown"
       mysql_active="no"
  -    @l_prefix@/bin/mysqladmin \
  +    [EMAIL PROTECTED]@/etc/mysql @l_prefix@/bin/mysqladmin \
           --defaults-extra-file=${mysql_pwd_file} \
           ping >/dev/null 2>&1 && mysql_active="yes"
       if [ $mysql_active = "no" -a -f $mysql_pid_file ] ; then
  @@ -54,7 +54,7 @@
           --defaults-extra-file=${mysql_pwd_file} \
           shutdown
   
  -%restart -p 400 -u @l_rusr@
  +%restart -p 400 -u @l_susr@
       rcService mysql enable yes || exit 0
       rcService mysql active no  && exit 0
       rc mysql stop start
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to