Selaa lähdekoodia

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

Ralf S. Engelschall 19 vuotta sitten
vanhempi
commit
6f3a7bdf66
3 muutettua tiedostoa jossa 12 lisäystä ja 12 poistoa
  1. 1 7
      mysql51/my.cnf
  2. 8 2
      mysql51/mysql51.spec
  3. 3 3
      mysql51/rc.mysql

+ 1 - 7
mysql51/my.cnf

@@ -18,11 +18,8 @@ log                              = @l_prefix@/var/mysql/common.log
 #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 @@ record_buffer                    = 131072
 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

+ 8 - 2
mysql51/mysql51.spec

@@ -39,16 +39,17 @@ Class:        EVAL
 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 @@ Provides:     mysql = %{version}-%{release}
 %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"

+ 3 - 3
mysql51/rc.mysql

@@ -23,10 +23,10 @@
     mysql_err_log=@l_prefix@/var/mysql/mysqld.err
     mysql_common_log=@l_prefix@/var/mysql/common.log
 
-%status -u @l_rusr@ -o
+%status -u @l_susr@ -o
     mysql_usable="unknown"
     mysql_active="no"
-    @l_prefix@/bin/mysqladmin \
+    HOME=@l_prefix@/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