OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Dec-2004 10:13:32
Branch: HEAD Handle: 2004121709132803
Added files:
openpkg-src/mysql40 my.cnf my.pwd mysql40.patch mysql40.spec rc.mysql
Modified files:
openpkg-src/mysql mysql.patch mysql.spec
Removed files:
openpkg-src/mysql3 my.cnf my.pwd mysql3.patch mysql3.spec rc.mysql3
openpkg-src/mysql41 my.cnf my.pwd mysql41.patch mysql41.spec rc.mysql
Log:
In preparation to OpenPKG 2.3, finally remove obsoleted/end-of-life
MySQL versions 3.23 and 4.0 in favor to the current stable production
version 4.1 and the development version 5.0. The following shifting was
done:
none -> PLUS mysql40 4.0.22
BASE mysql 4.0.22 -> BASE mysql 4.1.8
PLUS mysql41 4.1.8 -> none
EVAL mysql3 3.23.58 -> none
Summary:
Revision Changes Path
1.11 +70 -109 openpkg-src/mysql/mysql.patch
1.108 +11 -5 openpkg-src/mysql/mysql.spec
1.2 +0 -57 openpkg-src/mysql3/my.cnf
1.2 +0 -3 openpkg-src/mysql3/my.pwd
1.3 +0 -94 openpkg-src/mysql3/mysql3.patch
1.35 +0 -254 openpkg-src/mysql3/mysql3.spec
1.16 +0 -98 openpkg-src/mysql3/rc.mysql3
1.1 +89 -0 openpkg-src/mysql40/my.cnf
1.1 +8 -0 openpkg-src/mysql40/my.pwd
1.1 +153 -0 openpkg-src/mysql40/mysql40.patch
1.1 +287 -0 openpkg-src/mysql40/mysql40.spec
1.1 +98 -0 openpkg-src/mysql40/rc.mysql
1.3 +0 -89 openpkg-src/mysql41/my.cnf
1.3 +0 -8 openpkg-src/mysql41/my.pwd
1.3 +0 -80 openpkg-src/mysql41/mysql41.patch
1.29 +0 -291 openpkg-src/mysql41/mysql41.spec
1.5 +0 -98 openpkg-src/mysql41/rc.mysql
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 mysql.patch
--- openpkg-src/mysql/mysql.patch 15 Dec 2004 10:02:38 -0000 1.10
+++ openpkg-src/mysql/mysql.patch 17 Dec 2004 09:13:28 -0000 1.11
@@ -1,7 +1,29 @@
---- scripts/mysql_install_db.sh.dist Wed Jan 29 12:29:21 2003
-+++ scripts/mysql_install_db.sh Wed Feb 5 09:56:12 2003
-@@ -138,9 +138,8 @@
- then
+Index: mysys/default.c
+--- mysys/default.c.orig 2004-06-27 23:56:50 +0200
++++ mysys/default.c 2004-07-01 19:20:13 +0200
+@@ -48,7 +48,7 @@
+ #elif defined(__NETWARE__)
+ "sys:/etc/",
+ #else
+-"/etc/",
++"@l_prefix@/etc/mysql/",
+ #endif
+ #ifdef DATADIR
+ DATADIR,
+Index: scripts/msql2mysql.sh
+--- scripts/msql2mysql.sh.orig 2004-06-27 23:57:02 +0200
++++ scripts/msql2mysql.sh 2004-07-01 19:20:13 +0200
+@@ -13,4 +13,4 @@
+ # described in the License. Among other things, the License requires that
+ # the copyright notice and this notice be preserved on all copies.
+
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs
mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row
msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result
msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg
'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query
msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db
msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql
mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB
mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs
mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row
msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result
msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg
'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query
msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db
msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql
mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB
mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
+Index: scripts/mysql_install_db.sh
+--- scripts/mysql_install_db.sh.orig 2004-06-27 23:56:51 +0200
++++ scripts/mysql_install_db.sh 2004-07-01 19:20:13 +0200
+@@ -186,9 +186,8 @@
+
if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
if test ! -d $ldata/mysql; then mkdir $ldata/mysql; chmod 700
$ldata/mysql ; fi
- if test ! -d $ldata/test; then mkdir $ldata/test; chmod 700 $ldata/test
; fi
@@ -9,31 +31,10 @@
- chown $user $ldata $ldata/mysql $ldata/test;
+ chown $user $ldata $ldata/mysql
fi
- fi
-
-@@ -178,8 +177,6 @@
- c_d="$c_d )"
- c_d="$c_d comment='Database privileges';"
-
-- i_d="INSERT INTO db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
-- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');"
- fi
-
- if test ! -f $mdata/host.frm
-@@ -250,10 +247,7 @@
- INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
-
- REPLACE INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
-- REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
--
-- INSERT INTO user (host,user) values ('localhost','');
-- INSERT INTO user (host,user) values ('$hostname','');"
-+ REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
- fi
- if test ! -f $mdata/func.frm
-@@ -351,10 +345,7 @@
- if test "$IN_RPM" -eq 0
+ if test ! -f $mdata/db.frm
+@@ -262,10 +261,7 @@
+ if test "$in_rpm" = "0"
then
echo "You can start the MySQL daemon with:"
- echo "cd @prefix@ ; $bindir/mysqld_safe &"
@@ -44,88 +45,48 @@
echo
fi
echo "Please report any problems with the @scriptdir@/mysqlbug script!"
---- scripts/msql2mysql.sh.dist Tue Feb 11 09:50:29 2003
-+++ scripts/msql2mysql.sh Tue Feb 11 09:53:08 2003
-@@ -13,4 +13,4 @@
- # described in the License. Among other things, the License requires that
- # the copyright notice and this notice be preserved on all copies.
+Index: scripts/mysql_create_system_tables.sh
+--- scripts/mysql_create_system_tables.sh.orig 2004-06-27 23:57:01
+0200
++++ scripts/mysql_create_system_tables.sh 2004-07-01 19:23:36 +0200
+@@ -70,9 +70,6 @@
+ c_d="$c_d KEY User (User)"
+ c_d="$c_d )"
+ c_d="$c_d comment='Database privileges';"
+-
+- i_d="INSERT INTO db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
+- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');"
+ fi
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs
mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row
msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result
msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg
'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query
msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db
msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql
mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB
mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs
mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row
msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result
msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg
'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query
msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db
msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql
mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB
mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
---- mysys/default.c.dist Wed Jan 29 12:29:20 2003
-+++ mysys/default.c Wed Feb 5 09:58:40 2003
-@@ -49,7 +49,7 @@
- #elif defined(__NETWARE__)
- "sys:/etc/",
- #else
--"/etc/",
-+"@l_prefix@/etc/mysql/",
- #endif
- #ifdef DATADIR
- DATADIR,
---- config.h.in.orig 2004-12-09 12:21:30.331530371 +0100
-+++ config.h.in 2004-12-09 12:21:33.941576868 +0100
-@@ -628,6 +628,9 @@
- /* Define to 1 if you have the `setupterm' function. */
- #undef HAVE_SETUPTERM
-
-+/* Define to 1 if you have the <signal.h> header file. */
-+#undef HAVE_SIGNAL_H
-+
- /* Define to 1 if you have the `sighold' function. */
- #undef HAVE_SIGHOLD
-
---- include/my_pthread.h.orig 2004-10-28 02:48:34.000000000 +0200
-+++ include/my_pthread.h 2004-12-09 12:23:37.673149500 +0100
-@@ -229,7 +229,6 @@
-
- #ifdef HAVE_rts_threads
- #define sigwait org_sigwait
--#include <signal.h>
- #undef sigwait
- #endif
- #undef _REENTRANT /* Fix if _REENTRANT is in pthread.h */
-@@ -240,6 +239,9 @@
- #ifdef HAVE_THR_SETCONCURRENCY
- #include <thread.h> /* Probably solaris */
- #endif
-+#ifdef HAVE_SIGNAL_H
-+#include <signal.h>
-+#endif
- #ifdef HAVE_SCHED_H
- #include <sched.h>
- #endif
---- configure.in.orig 2004-10-28 02:48:38.000000000 +0200
-+++ configure.in 2004-12-09 12:26:09.585078188 +0100
-@@ -735,7 +735,7 @@
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
-- memory.h pwd.h select.h \
-+ memory.h pwd.h select.h signal.h \
- stdlib.h stddef.h \
- strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h
arpa/inet.h \
- sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
---- configure.orig 2004-10-28 02:48:59.000000000 +0200
-+++ configure 2004-12-09 12:22:45.602487633 +0100
-@@ -21408,7 +21408,7 @@
-
-
- for ac_header in fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
-- memory.h pwd.h select.h \
-+ memory.h pwd.h select.h signal.h \
- stdlib.h stddef.h \
- strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h
arpa/inet.h \
- sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
+ if test ! -f $mdata/host.frm
+@@ -147,17 +144,13 @@
+ then
+ i_u="INSERT INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+ INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+- REPLACE INTO user VALUES
('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+- INSERT INTO user (host,user) values ('localhost','');
+- INSERT INTO user (host,user) values ('$hostname','');"
++ REPLACE INTO user VALUES
('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
+ else
+ i_u="INSERT INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
+ if test "$windows" = "0"
+ then
+ i_u="$i_u
+- INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+- INSERT INTO user (host,user) values ('$hostname','');
+- INSERT INTO user (host,user) values ('localhost','');"
++ INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
+ else
+ i_u="$i_u
+ INSERT INTO user VALUES
('%','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
Index: include/Makefile.in
---- include/Makefile.in.orig 2004-10-28 02:48:55 +0200
-+++ include/Makefile.in 2004-12-14 14:27:28 +0100
-@@ -281,14 +281,14 @@
- my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
+--- include/Makefile.in.orig 2004-12-14 13:41:12 +0100
++++ include/Makefile.in 2004-12-17 09:48:10 +0100
+@@ -324,14 +324,14 @@
errmsg.h my_global.h my_net.h my_alloc.h \
- my_getopt.h sslopt-longopts.h my_dir.h \
-- sslopt-vars.h sslopt-case.h $(BUILT_SOURCES)
-+ sslopt-vars.h sslopt-case.h my_aes.h rijndael.h
$(BUILT_SOURCES)
+ my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
+ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
+- sql_state.h mysql_time.h $(BUILT_SOURCES)
++ sql_state.h mysql_time.h my_aes.h rijndael.h
$(BUILT_SOURCES)
noinst_HEADERS = config-win.h config-os2.h config-netware.h \
nisam.h heap.h merge.h my_bitmap.h\
@@ -135,8 +96,8 @@
- my_aes.h my_tree.h hash.h thr_alarm.h \
+ my_nosys.h my_alarm.h queues.h sha1.h \
+ my_tree.h hash.h thr_alarm.h \
- thr_lock.h t_ctype.h violite.h md5.h mysql_version.h.in
-
+ thr_lock.h t_ctype.h violite.h md5.h \
+ mysql_version.h.in my_handler.h my_time.h
Index: scripts/mysql_config.sh
--- scripts/mysql_config.sh.orig 2004-10-28 02:48:36 +0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.107 -r1.108 mysql.spec
--- openpkg-src/mysql/mysql.spec 15 Dec 2004 10:02:38 -0000 1.107
+++ openpkg-src/mysql/mysql.spec 17 Dec 2004 09:13:28 -0000 1.108
@@ -24,8 +24,8 @@
##
# package version
-%define V_major 4.0
-%define V_minor 22
+%define V_major 4.1
+%define V_minor 8
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@@ -40,13 +40,14 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20041215
+Release: 20041217
# package options
%option with_server yes
%option with_bdb yes
%option with_innodb no
%option with_ssl no
+%option with_ndb no
# list of sources
Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{V_mysql}.tar.gz
@@ -58,7 +59,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, perl, gcc
+BuildPreReq: OpenPKG, openpkg >= 20040130, perl, gcc, make
PreReq: OpenPKG, openpkg >= 20040130, perl
BuildPreReq: zlib, readline, ncurses
PreReq: zlib, readline, ncurses
@@ -75,7 +76,7 @@
%track
prog mysql = {
- version = %{V_major}.%{V_minor}
+ version = %{V_mysql}
url = http://dev.mysql.com/downloads/mysql/%{V_major}.html
regex = mysql-(__VER__)\.tar\.gz
}
@@ -126,6 +127,10 @@
--with-openssl-includes=%{l_prefix}/include \
--with-openssl-libs=%{l_prefix}/lib \
%endif
+%if "%{with_ndb}" == "yes"
+ --with-ndbcluster \
+ --with-ndb-shm \
+%endif
--without-readline \
--without-libedit \
--with-vio \
@@ -160,6 +165,7 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/mysql-%{V_mysql}.spec
rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/binary-configure
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/make_win_src_distribution
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/make_win_binary_distribution
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/comp_err
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
strip $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/* 2>/dev/null || true
@@ .
rm -f openpkg-src/mysql3/my.cnf <<'@@ .'
Index: openpkg-src/mysql3/my.cnf
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql3/my.pwd <<'@@ .'
Index: openpkg-src/mysql3/my.pwd
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql3/mysql3.patch <<'@@ .'
Index: openpkg-src/mysql3/mysql3.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql3/mysql3.spec <<'@@ .'
Index: openpkg-src/mysql3/mysql3.spec
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql3/rc.mysql3 <<'@@ .'
Index: openpkg-src/mysql3/rc.mysql3
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql40/my.cnf
============================================================================
$ cvs diff -u -r0 -r1.1 my.cnf
--- /dev/null 2004-12-17 10:13:30 +0100
+++ my.cnf 2004-12-17 10:13:30 +0100
@@ -0,0 +1,89 @@
+##
+## my.cnf -- MySQL configuration
+##
+
+[client]
+socket = @l_prefix@/var/mysql/mysql.sock
+port = 3306
+
+[mysqld]
+#
+# Network settings
+#
+
+bind-address = 127.0.0.1
+port = 3306
+
+# Unix domain socket only, disables TCP/IP
+#skip-networking
+
+#
+# Log file settings
+#
+
+# log file destinations (must be in sync with settings in rc.conf)
+log = @l_prefix@/var/mysql/common.log
+log-update = @l_prefix@/var/mysql/update.log
+# binary log (use instead of log-update, server-id must be unique for
+# replication)
+#log-bin = @l_prefix@/var/mysql/binary.log
+#server-id = 1
+
+#
+# Performance settings
+#
+
+# most important tuning parameters for mysqld
+set-variable = key_buffer_size=64M
+set-variable = table_cache=256
+
+# less important tuning parameters (change if special problems occur)
+set-variable = join_buffer_size=1M
+set-variable = max_connections=1000
+set-variable = max_connect_errors=10
+set-variable = max_delayed_threads=20
+set-variable = max_heap_table_size=16777216
+set-variable = max_sort_length=1024
+set-variable = max_user_connections=1000
+set-variable = record_buffer=131072
+set-variable = sort_buffer=4M
+set-variable = key_buffer=1M
+set-variable = tmp_table_size=32M
+
+# permanent query caching
+set-variable = query_cache_type=1
+# maximum caching size of an individual query
+set-variable = query_cache_limit=1M
+# maximum query cache size
+set-variable = query_cache_size=32M
+
+# minimum chars for full-text search (FTS) index
+#ft_min_word_len=3
+
+# Berkeley DB
+set-variable = [EMAIL PROTECTED]@
+set-variable = [EMAIL PROTECTED]@
+set-variable = [EMAIL PROTECTED]@
+
+# Innobase DB
+#set-variable = innodb_buffer_pool_size=70M
+#set-variable = innodb_additional_mem_pool_size=2M
+#set-variable = innodb_log_files_in_group=3
+#set-variable = innodb_log_file_size=20M
+#set-variable = innodb_log_buffer_size=8M
+#set-variable = innodb_lock_wait_timeout=50
+
+#
+# Miscellaneous
+#
+
+# directory for temporary tables
[EMAIL PROTECTED]@/var/mysql/tmp
+
+[mysqld_safe]
+datadir = @l_prefix@/var/mysql
+socket = @l_prefix@/var/mysql/mysql.sock
+set-variable = [EMAIL PROTECTED]@/var/mysql/mysqld.pid
+user = @l_rusr@
+basedir = @l_prefix@
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql40/my.pwd
============================================================================
$ cvs diff -u -r0 -r1.1 my.pwd
--- /dev/null 2004-12-17 10:13:30 +0100
+++ my.pwd 2004-12-17 10:13:30 +0100
@@ -0,0 +1,8 @@
+##
+## my.pwd -- MySQL configuration (administrator password only)
+##
+
+[mysqladmin]
+user = root
+password =
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql40/mysql40.patch
============================================================================
$ cvs diff -u -r0 -r1.1 mysql40.patch
--- /dev/null 2004-12-17 10:13:30 +0100
+++ mysql40.patch 2004-12-17 10:13:30 +0100
@@ -0,0 +1,153 @@
+--- scripts/mysql_install_db.sh.dist Wed Jan 29 12:29:21 2003
++++ scripts/mysql_install_db.sh Wed Feb 5 09:56:12 2003
+@@ -138,9 +138,8 @@
+ then
+ if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
+ if test ! -d $ldata/mysql; then mkdir $ldata/mysql; chmod 700
$ldata/mysql ; fi
+- if test ! -d $ldata/test; then mkdir $ldata/test; chmod 700 $ldata/test
; fi
+ if test -w / -a ! -z "$user"; then
+- chown $user $ldata $ldata/mysql $ldata/test;
++ chown $user $ldata $ldata/mysql
+ fi
+ fi
+
+@@ -178,8 +177,6 @@
+ c_d="$c_d )"
+ c_d="$c_d comment='Database privileges';"
+
+- i_d="INSERT INTO db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
+- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');"
+ fi
+
+ if test ! -f $mdata/host.frm
+@@ -250,10 +247,7 @@
+ INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+
+ REPLACE INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+- REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+-
+- INSERT INTO user (host,user) values ('localhost','');
+- INSERT INTO user (host,user) values ('$hostname','');"
++ REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
+ fi
+
+ if test ! -f $mdata/func.frm
+@@ -351,10 +345,7 @@
+ if test "$IN_RPM" -eq 0
+ then
+ echo "You can start the MySQL daemon with:"
+- echo "cd @prefix@ ; $bindir/mysqld_safe &"
+- echo
+- echo "You can test the MySQL daemon with the benchmarks in the
'sql-bench' directory:"
+- echo "cd sql-bench ; perl run-all-tests"
++ echo "@l_prefix@/etc/rc mysql start"
+ echo
+ fi
+ echo "Please report any problems with the @scriptdir@/mysqlbug script!"
+--- scripts/msql2mysql.sh.dist Tue Feb 11 09:50:29 2003
++++ scripts/msql2mysql.sh Tue Feb 11 09:53:08 2003
+@@ -13,4 +13,4 @@
+ # described in the License. Among other things, the License requires that
+ # the copyright notice and this notice be preserved on all copies.
+
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs
mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row
msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result
msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg
'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query
msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db
msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql
mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB
mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs
mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row
msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result
msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg
'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query
msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db
msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql
mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB
mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
+--- mysys/default.c.dist Wed Jan 29 12:29:20 2003
++++ mysys/default.c Wed Feb 5 09:58:40 2003
+@@ -49,7 +49,7 @@
+ #elif defined(__NETWARE__)
+ "sys:/etc/",
+ #else
+-"/etc/",
++"@l_prefix@/etc/mysql/",
+ #endif
+ #ifdef DATADIR
+ DATADIR,
+--- config.h.in.orig 2004-12-09 12:21:30.331530371 +0100
++++ config.h.in 2004-12-09 12:21:33.941576868 +0100
+@@ -628,6 +628,9 @@
+ /* Define to 1 if you have the `setupterm' function. */
+ #undef HAVE_SETUPTERM
+
++/* Define to 1 if you have the <signal.h> header file. */
++#undef HAVE_SIGNAL_H
++
+ /* Define to 1 if you have the `sighold' function. */
+ #undef HAVE_SIGHOLD
+
+--- include/my_pthread.h.orig 2004-10-28 02:48:34.000000000 +0200
++++ include/my_pthread.h 2004-12-09 12:23:37.673149500 +0100
+@@ -229,7 +229,6 @@
+
+ #ifdef HAVE_rts_threads
+ #define sigwait org_sigwait
+-#include <signal.h>
+ #undef sigwait
+ #endif
+ #undef _REENTRANT /* Fix if _REENTRANT is in pthread.h */
+@@ -240,6 +239,9 @@
+ #ifdef HAVE_THR_SETCONCURRENCY
+ #include <thread.h> /* Probably solaris */
+ #endif
++#ifdef HAVE_SIGNAL_H
++#include <signal.h>
++#endif
+ #ifdef HAVE_SCHED_H
+ #include <sched.h>
+ #endif
+--- configure.in.orig 2004-10-28 02:48:38.000000000 +0200
++++ configure.in 2004-12-09 12:26:09.585078188 +0100
+@@ -735,7 +735,7 @@
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
+- memory.h pwd.h select.h \
++ memory.h pwd.h select.h signal.h \
+ stdlib.h stddef.h \
+ strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h
arpa/inet.h \
+ sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
+--- configure.orig 2004-10-28 02:48:59.000000000 +0200
++++ configure 2004-12-09 12:22:45.602487633 +0100
+@@ -21408,7 +21408,7 @@
+
+
+ for ac_header in fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
+- memory.h pwd.h select.h \
++ memory.h pwd.h select.h signal.h \
+ stdlib.h stddef.h \
+ strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h
arpa/inet.h \
+ sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
+Index: include/Makefile.in
+--- include/Makefile.in.orig 2004-10-28 02:48:55 +0200
++++ include/Makefile.in 2004-12-14 14:27:28 +0100
+@@ -281,14 +281,14 @@
+ my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
+ errmsg.h my_global.h my_net.h my_alloc.h \
+ my_getopt.h sslopt-longopts.h my_dir.h \
+- sslopt-vars.h sslopt-case.h $(BUILT_SOURCES)
++ sslopt-vars.h sslopt-case.h my_aes.h rijndael.h
$(BUILT_SOURCES)
+
+ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+ nisam.h heap.h merge.h my_bitmap.h\
+ myisam.h myisampack.h myisammrg.h ft_global.h\
+ mysys_err.h my_base.h help_start.h help_end.h \
+- my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
+- my_aes.h my_tree.h hash.h thr_alarm.h \
++ my_nosys.h my_alarm.h queues.h sha1.h \
++ my_tree.h hash.h thr_alarm.h \
+ thr_lock.h t_ctype.h violite.h md5.h mysql_version.h.in
+
+
+Index: scripts/mysql_config.sh
+--- scripts/mysql_config.sh.orig 2004-10-28 02:48:36 +0200
++++ scripts/mysql_config.sh 2004-12-14 14:29:04 +0100
+@@ -86,7 +86,7 @@
+
+ # Create options
+
+-libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs"
++libs="$ldflags -L$pkglibdir -lmysqlclient -lmysys $client_libs"
+ libs=`echo "$libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's;
*\$;;'`
+-libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@"
++libs_r="$ldflags -L$pkglibdir -lmysqlclient_r -lmysys_r @LIBS@
@openssl_libs@"
+ libs_r=`echo "$libs_r" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e
's; *\$;;'`
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql40/mysql40.spec
============================================================================
$ cvs diff -u -r0 -r1.1 mysql40.spec
--- /dev/null 2004-12-17 10:13:30 +0100
+++ mysql40.spec 2004-12-17 10:13:30 +0100
@@ -0,0 +1,287 @@
+##
+## mysql40.spec -- OpenPKG RPM Specification
+## Copyright (c) 2000-2004 The OpenPKG Project <http://www.openpkg.org/>
+## Copyright (c) 2000-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
+## Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package version
+%define V_major 4.0
+%define V_minor 22
+%define V_mysql %{V_major}.%{V_minor}
+%define V_opkg %{V_major}.%{V_minor}
+
+# package information
+Name: mysql40
+Summary: Fast Relational Database Management System
+URL: http://www.mysql.com/products/mysql/
+Vendor: MySQL AB
+Packager: The OpenPKG Project
+Distribution: OpenPKG
+Class: PLUS
+Group: Database
+License: GPL
+Version: %{V_opkg}
+Release: 20041217
+
+# package options
+%option with_server yes
+%option with_bdb yes
+%option with_innodb no
+%option with_ssl no
+
+# list of sources
+Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{V_mysql}.tar.gz
+Source1: my.cnf
+Source2: my.pwd
+Source3: rc.mysql
+Patch0: mysql40.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot: %{l_buildroot}
+BuildPreReq: OpenPKG, openpkg >= 20040130, perl, gcc, make
+PreReq: OpenPKG, openpkg >= 20040130, perl
+BuildPreReq: zlib, readline, ncurses
+PreReq: zlib, readline, ncurses
+AutoReq: no
+AutoReqProv: no
+Provides: mysql = %{version}-%{release}
+
+%description
+ MySQL is a multi-user Relational Database Management System (RDBMS),
+ which is controlled through Structured Query Language (SQL) operating in
+ full multi-threading mode. The main goals of MySQL are speed, robustness
+ and ease of use. MySQL was originally developed because of the need for
+ a SQL server that could handle very big databases with magnitude higher
+ speed than what any database vendor could offer.
+
+ NOTICE: This package contains the old and previous MySQL 4.0
+ version. Please use the "mysql" package, containing the current
+ stable MySQL 4.1 version.
+
+%track
+ prog mysql40 = {
+ version = %{V_mysql}
+ url = http://dev.mysql.com/downloads/mysql/%{V_major}.html
+ regex = mysql-(4\.0\.\d+)\.tar\.gz
+ }
+
+%prep
+ %setup -q -n mysql-%{V_mysql}
+ %patch -p0
+
+%build
+ # patch file search path
+ %{l_shtool} subst %{l_value -s -a} \
+ mysys/default.c
+
+ # determine additional configure options
+ case "%{l_platform -t}" in
+ *-freebsd* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
+ *-linux* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
+ *-sunos* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
+ esac
+
+ # configure source tree
+ CC="%{l_cc}" \
+ CXX="%{l_cxx}" \
+ CFLAGS="%{l_cflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
+ CPPFLAGS="%{l_cppflags ncurses}" \
+ LDFLAGS="-L`pwd`/bdb/build_unix -L`pwd`/libmysql %{l_ldflags}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/mysql \
+ --localstatedir=%{l_prefix}/var/mysql \
+ --libexecdir=%{l_prefix}/libexec/mysql \
+ --with-unix-socket-path=%{l_prefix}/var/mysql/mysql.sock \
+ --with-mysqld-user=%{l_musr} \
+ --enable-thread-safe-client \
+ --with-comment="%{l_openpkg_release}" \
+%if "%{with_server}" != "yes"
+ --without-server \
+%endif
+%if "%{with_bdb}" == "yes"
+ --with-berkeley-db \
+%endif
+%if "%{with_innodb}" == "no"
+ --without-innodb \
+%endif
+%if "%{with_ssl}" == "yes"
+ --with-openssl \
+ --with-openssl-includes=%{l_prefix}/include \
+ --with-openssl-libs=%{l_prefix}/lib \
+%endif
+ --without-readline \
+ --without-libedit \
+ --with-vio \
+ --with-named-z-libs=no \
+ --with-low-memory \
+ --disable-shared \
+ $opt
+
+ # build source tree
+ %{l_make} %{l_mflags}
+
+%install
+ rm -rf $RPM_BUILD_ROOT
+
+ # patch init script
+ %{l_shtool} subst %{l_value -s -a} \
+ scripts/mysql_install_db.sh
+
+ # perform standard installation procedure
+ %{l_make} %{l_mflags} install \
+ AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" \
+ DESTDIR=$RPM_BUILD_ROOT
+
+ # move utility 'replace', msql2mysql is patched for new path
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/replace \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/
+
+ # strip installation area
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/mysql-test
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/sql-bench
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/mysql-%{V_mysql}.spec
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/binary-configure
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/make_win_src_distribution
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/make_win_binary_distribution
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/comp_err
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+ strip $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/* 2>/dev/null || true
+
+ # determine default parameters
+%if "%{with_bdb}" == "yes"
+ l_mysql_bdb_cache_size=8M
+ l_mysql_bdb_log_buffer_size=32k
+ l_mysql_bdb_max_lock=10000
+%else
+ l_mysql_bdb_cache_size=0
+ l_mysql_bdb_log_buffer_size=0
+ l_mysql_bdb_max_lock=0
+%endif
+%if "%{with_bdb}" == "yes" || "%{with_innodb}" == "yes"
+ l_mysqld=mysqld
+%else
+ l_mysqld=mysqld-max
+%endif
+
+ # install global configuration
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ -e "s;@l_mysql_bdb_cache_size@;${l_mysql_bdb_cache_size};g" \
+ -e
"s;@l_mysql_bdb_log_buffer_size@;${l_mysql_bdb_log_buffer_size};g" \
+ -e "s;@l_mysql_bdb_max_lock@;${l_mysql_bdb_max_lock};g" \
+ %{SOURCE my.cnf} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/mysql/
+ %{l_shtool} install -c -m 600 \
+ %{SOURCE my.pwd} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/mysql/
+
+ # install run-command script
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ -e "s;@l_mysqld@;${l_mysqld};g" \
+ %{SOURCE rc.mysql} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # make sure the database directory exists
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/mysql
+
+ # directory for temporary tables
+ %{l_shtool} mkdir -f -p -m 700 $RPM_BUILD_ROOT%{l_prefix}/var/mysql/tmp
+
+ # optional client-only installation
+%if "%{with_server}" != "yes"
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin/*
+%endif
+
+ # determine the package files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+%if "%{with_server}" == "yes"
+ %{l_files_std} \
+ '%config %attr(644,%{l_musr},%{l_mgrp})
%{l_prefix}/etc/mysql/my.cnf' \
+ '%config %attr(600,%{l_susr},%{l_mgrp})
%{l_prefix}/etc/mysql/my.pwd' \
+ '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/mysql' \
+ '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/mysql/tmp'
+%else
+ %{l_files_std}
+%endif
+
+%files -f files
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
+%pre
+%if "%{with_server}" == "yes"
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} mysql status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} mysql stop 2>/dev/null
+%endif
+ exit 0
+
+%post
+%if "%{with_server}" == "yes"
+ if [ $1 -eq 1 ]; then
+ # after install, create initial database
+ $RPM_INSTALL_PREFIX/bin/mysql_install_db \
+ --defaults-file=$RPM_INSTALL_PREFIX/etc/mysql/my.cnf >/dev/null
2>&1
+ chown -R %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/mysql/*
+ ( echo "An initial MySQL DB was created. The owner of the database"
+ echo "is the DB user 'root'. Its initial password is empty."
+ echo "After starting MySQL with..."
+ echo ""
+ echo " \$ $RPM_INSTALL_PREFIX/etc/rc mysql start"
+ echo ""
+ echo "...you should change the password as soon as possible with:"
+ echo ""
+ echo " \$ $RPM_INSTALL_PREFIX/bin/mysqladmin \\ "
+ echo " -u root password '<new-password>'"
+ echo ""
+ echo "Additionally, because the MySQL package includes automated"
+ echo "maintenance procedures that require administrator access to"
+ echo "the database, you must maintain a (plain text) copy of the"
+ echo "administrator account name and password:"
+ echo ""
+ echo " \$ vi $RPM_INSTALL_PREFIX/etc/mysql/my.pwd"
+ ) | %{l_rpmtool} msg -b -t notice
+ fi
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ { eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}; true; } >/dev/null
2>&1
+ [ ".$mysql_active" = .yes ] && %{l_rc} mysql start
+ fi
+%endif
+ exit 0
+
+%preun
+%if "%{with_server}" == "yes"
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} mysql stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/mysql/*.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/mysql/*.err* >/dev/null 2>&1 || true
+%endif
+ exit 0
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql40/rc.mysql
============================================================================
$ cvs diff -u -r0 -r1.1 rc.mysql
--- /dev/null 2004-12-17 10:13:30 +0100
+++ rc.mysql 2004-12-17 10:13:30 +0100
@@ -0,0 +1,98 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.mysql -- Run-Commands
+##
+
+%config
+ mysql_enable="$openpkg_rc_def"
+ [EMAIL PROTECTED]@/etc/mysql/my.pwd
+ [EMAIL PROTECTED]@/etc/mysql/my.cnf
+ mysql_common_prolog="true"
+ mysql_common_epilog="true"
+ mysql_common_numfiles="10"
+ mysql_common_minsize="1M"
+ mysql_common_complevel="9"
+ mysql_update_prolog="true"
+ mysql_update_epilog="true"
+ mysql_update_numfiles="10"
+ mysql_update_minsize="1M"
+ mysql_update_complevel="9"
+ mysql_err_prolog="true"
+ mysql_err_epilog="true"
+ mysql_err_numfiles="10"
+ mysql_err_minsize="1M"
+ mysql_err_complevel="9"
+
+%common
+ # same paths as in my.cnf
+ [EMAIL PROTECTED]@/var/mysql/mysqld.pid
+ [EMAIL PROTECTED]@/var/mysql/mysqld.err
+ [EMAIL PROTECTED]@/var/mysql/common.log
+ [EMAIL PROTECTED]@/var/mysql/update.log
+
+%status -u @l_rusr@ -o
+ mysql_usable="unknown"
+ mysql_active="no"
+ @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
+ kill -0 `cat $mysql_pid_file` && mysql_active="unknown"
+ fi
+ echo "mysql_enable=\"$mysql_enable\""
+ echo "mysql_usable=\"$mysql_usable\""
+ echo "mysql_active=\"$mysql_active\""
+
+%start -p 400 -u @l_rusr@
+ rcService mysql enable yes || exit 0
+ rcService mysql active yes && exit 0
+ cd @l_prefix@
+ @l_prefix@/bin/mysqld_safe >/dev/null 2>&1 \
+ [EMAIL PROTECTED]@ \
+ --pid-file="$mysql_pid_file" \
+ --err-log="$mysql_log_err" &
+
+%stop -p 600 -u @l_susr@
+ rcService mysql enable yes || exit 0
+ rcService mysql active no && exit 0
+ @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql_pwd_file} \
+ flush-logs
+ @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql_pwd_file} \
+ shutdown
+
+%restart -p 400 -u @l_rusr@
+ rcService mysql enable yes || exit 0
+ rcService mysql active no && exit 0
+ rc mysql stop start
+
+%daily -u @l_susr@
+ rcService mysql enable yes || exit 0
+
+ # rotate logfiles
+ rcTmp -i
+ hintfile=`rcTmp -f -n hint`
+ shtool rotate -f \
+ -n ${mysql_common_numfiles} -s ${mysql_common_minsize} -d \
+ -z ${mysql_common_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
+ -P "${mysql_common_prolog}" \
+ -E "${mysql_common_epilog}; echo 1 >$hintfile" \
+ ${mysql_common_log}
+ shtool rotate -f \
+ -n ${mysql_update_numfiles} -s ${mysql_update_minsize} -d \
+ -z ${mysql_update_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
+ -P "${mysql_update_prolog}" \
+ -E "${mysql_update_epilog}; echo 1 >$hintfile" \
+ ${mysql_update_log}
+ shtool rotate -f \
+ -n ${mysql_err_numfiles} -s ${mysql_err_minsize} -d \
+ -z ${mysql_err_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
+ -P "${mysql_err_prolog}" \
+ -E "${mysql_err_epilog}; echo 1 >$hintfile" \
+ ${mysql_err_log}
+ if [ -s $hintfile ]; then
+ rc mysql restart
+ fi
+ rcTmp -k
+
@@ .
rm -f openpkg-src/mysql41/my.cnf <<'@@ .'
Index: openpkg-src/mysql41/my.cnf
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql41/my.pwd <<'@@ .'
Index: openpkg-src/mysql41/my.pwd
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql41/mysql41.patch <<'@@ .'
Index: openpkg-src/mysql41/mysql41.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql41/mysql41.spec <<'@@ .'
Index: openpkg-src/mysql41/mysql41.spec
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql41/rc.mysql <<'@@ .'
Index: openpkg-src/mysql41/rc.mysql
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
