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: 01-Jul-2004 19:37:47
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/mysql41 mysql41.patch mysql41.spec
Log:
upgrading package: mysql41 4.1.2 -> 4.1.3
Summary:
Revision Changes Path
1.2 +15 -15 openpkg-src/mysql41/mysql41.patch
1.12 +3 -3 openpkg-src/mysql41/mysql41.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql41/mysql41.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 mysql41.patch
--- openpkg-src/mysql41/mysql41.patch 5 Jan 2004 14:44:25 -0000 1.1
+++ openpkg-src/mysql41/mysql41.patch 1 Jul 2004 17:37:46 -0000 1.2
@@ -1,6 +1,6 @@
Index: mysys/default.c
---- mysys/default.c.orig 2003-12-01 13:55:03.000000000 +0100
-+++ mysys/default.c 2004-01-05 14:12:26.000000000 +0100
+--- 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/",
@@ -11,8 +11,8 @@
#ifdef DATADIR
DATADIR,
Index: scripts/msql2mysql.sh
---- scripts/msql2mysql.sh.orig 2003-12-01 13:55:06.000000000 +0100
-+++ scripts/msql2mysql.sh 2004-01-05 14:12:26.000000000 +0100
+--- 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.
@@ -20,9 +20,9 @@
[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 2003-12-01 13:55:04.000000000 +0100
-+++ scripts/mysql_install_db.sh 2004-01-05 14:12:26.000000000 +0100
-@@ -177,9 +177,8 @@
+--- 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
@@ -33,7 +33,7 @@
fi
if test ! -f $mdata/db.frm
-@@ -234,10 +233,7 @@
+@@ -262,10 +261,7 @@
if test "$in_rpm" = "0"
then
echo "You can start the MySQL daemon with:"
@@ -46,9 +46,9 @@
fi
echo "Please report any problems with the @scriptdir@/mysqlbug script!"
Index: scripts/mysql_create_system_tables.sh
---- scripts/mysql_create_system_tables.sh.orig 2003-12-01 13:55:05.000000000
+0100
-+++ scripts/mysql_create_system_tables.sh 2004-01-05 15:25:57.000000000 +0100
-@@ -68,9 +68,6 @@
+--- 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';"
@@ -58,7 +58,7 @@
fi
if test ! -f $mdata/host.frm
-@@ -145,17 +142,13 @@
+@@ -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);
@@ -70,11 +70,11 @@
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
+ 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="INSERT INTO user VALUES
('localhost','','','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
+ 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);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql41/mysql41.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 mysql41.spec
--- openpkg-src/mysql41/mysql41.spec 9 Jun 2004 06:54:26 -0000 1.11
+++ openpkg-src/mysql41/mysql41.spec 1 Jul 2004 17:37:46 -0000 1.12
@@ -25,8 +25,8 @@
# package version
%define V_major 4.1
-%define V_minor 2
-%define V_mysql %{V_major}.%{V_minor}-alpha
+%define V_minor 3
+%define V_mysql %{V_major}.%{V_minor}-beta
%define V_opkg %{V_major}.%{V_minor}
# package information
@@ -40,7 +40,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20040609
+Release: 20040701
# package options
%option with_bdb yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
