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: 10-May-2007 17:39:15
Branch: HEAD Handle: 2007051016391400
Modified files:
openpkg-src/mysql mysql.patch mysql.spec
Log:
upgrading package: mysql 5.0.37 -> 5.0.41
Summary:
Revision Changes Path
1.26 +20 -41 openpkg-src/mysql/mysql.patch
1.167 +2 -2 openpkg-src/mysql/mysql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.25 -r1.26 mysql.patch
--- openpkg-src/mysql/mysql.patch 10 Jan 2007 18:53:52 -0000 1.25
+++ openpkg-src/mysql/mysql.patch 10 May 2007 15:39:14 -0000 1.26
@@ -1,7 +1,7 @@
Index: include/my_global.h
---- include/my_global.h.orig 2007-01-09 13:51:49 +0100
-+++ include/my_global.h 2007-01-10 08:49:00 +0100
-@@ -777,9 +777,8 @@
+--- include/my_global.h.orig 2007-05-02 16:40:53 +0200
++++ include/my_global.h 2007-05-10 07:54:13 +0200
+@@ -812,9 +812,8 @@
#define SSIZE_MAX ((~((size_t) 0)) / 2)
#endif
@@ -13,9 +13,9 @@
/* Define missing math constants. */
#ifndef M_PI
Index: mysys/default.c
---- mysys/default.c.orig 2007-01-09 13:51:38 +0100
-+++ mysys/default.c 2007-01-10 08:49:00 +0100
-@@ -1007,7 +1007,7 @@
+--- mysys/default.c.orig 2007-05-02 16:40:31 +0200
++++ mysys/default.c 2007-05-10 07:54:13 +0200
+@@ -1006,7 +1006,7 @@
if ((env= getenv("ETC")))
*ptr++= env;
#endif
@@ -25,9 +25,9 @@
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
*ptr++= env;
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2007-01-09 13:51:28 +0100
-+++ scripts/mysql_config.sh 2007-01-10 08:49:00 +0100
-@@ -98,9 +98,9 @@
+--- scripts/mysql_config.sh.orig 2007-05-02 16:40:15 +0200
++++ scripts/mysql_config.sh 2007-05-10 07:54:13 +0200
+@@ -97,9 +97,9 @@
# Create options
# We intentionally add a space to the beginning and end of lib strings,
simplifies replace later
@@ -39,36 +39,15 @@
embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@
@WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
-Index: scripts/mysql_create_system_tables.sh
---- scripts/mysql_create_system_tables.sh.orig 2007-01-09 13:51:08
+0100
-+++ scripts/mysql_create_system_tables.sh 2007-01-10 08:49:00 +0100
-@@ -77,9 +77,6 @@
- c_d="$c_d ) engine=MyISAM"
- c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
- 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','Y','Y','Y','N','N');
-- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');"
- fi
+Index: scripts/mysql_system_tables_data.sql
+--- scripts/mysql_system_tables_data.sql.orig 2007-05-02 16:40:01
+0200
++++ scripts/mysql_system_tables_data.sql 2007-05-10 07:55:32 +0200
+@@ -5,8 +5,6 @@
+ -- Fill "db" table with default grants for anyone to
+ -- access database 'test' and 'test_%' if "db" table didn't exist
+ CREATE TEMPORARY TABLE tmp_db LIKE db;
+-INSERT INTO tmp_db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
+-INSERT INTO tmp_db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
+ INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
+ DROP TABLE tmp_db;
- if test ! -f $mdata/host.frm
-@@ -167,17 +164,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,0,0,0);"
- else
- i_u="$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','Y','','','','',0,0,0);"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.166 -r1.167 mysql.spec
--- openpkg-src/mysql/mysql.spec 13 Apr 2007 08:48:19 -0000 1.166
+++ openpkg-src/mysql/mysql.spec 10 May 2007 15:39:14 -0000 1.167
@@ -24,7 +24,7 @@
# package version
%define V_major 5.0
-%define V_minor 37
+%define V_minor 41
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20070413
+Release: 20070510
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
