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: 13-Apr-2007 10:01:26
Branch: HEAD Handle: 2007041309012600
Modified files:
openpkg-src/mysql51 mysql51.patch mysql51.spec
Log:
upgrading package: mysql51 5.1.16 -> 5.1.17
Summary:
Revision Changes Path
1.7 +26 -45 openpkg-src/mysql51/mysql51.patch
1.21 +2 -2 openpkg-src/mysql51/mysql51.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 mysql51.patch
--- openpkg-src/mysql51/mysql51.patch 7 Feb 2007 08:07:28 -0000 1.6
+++ openpkg-src/mysql51/mysql51.patch 13 Apr 2007 08:01:26 -0000 1.7
@@ -1,7 +1,7 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2007-01-30 09:35:30 +0100
-+++ include/Makefile.in 2007-02-07 08:54:33 +0100
-@@ -393,14 +393,14 @@
+--- include/Makefile.in.orig 2007-04-04 15:18:39 +0200
++++ include/Makefile.in 2007-04-13 09:39:03 +0200
+@@ -396,14 +396,14 @@
errmsg.h my_global.h my_net.h \
my_getopt.h sslopt-longopts.h my_dir.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
@@ -20,8 +20,8 @@
mysql_version.h.in my_handler.h my_time.h decimal.h \
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
Index: include/my_global.h
---- include/my_global.h.orig 2007-01-30 09:34:31 +0100
-+++ include/my_global.h 2007-02-07 08:54:33 +0100
+--- include/my_global.h.orig 2007-04-04 15:15:25 +0200
++++ include/my_global.h 2007-04-13 09:39:03 +0200
@@ -876,9 +876,8 @@
#define SSIZE_MAX ((~((size_t) 0)) / 2)
#endif
@@ -34,8 +34,8 @@
/* Define missing math constants. */
#ifndef M_PI
Index: mysys/default.c
---- mysys/default.c.orig 2007-01-30 09:34:13 +0100
-+++ mysys/default.c 2007-02-07 08:56:38 +0100
+--- mysys/default.c.orig 2007-04-04 15:13:42 +0200
++++ mysys/default.c 2007-04-13 09:39:03 +0200
@@ -1011,8 +1011,7 @@
#elif defined(__NETWARE__)
*ptr++= "sys:/etc/";
@@ -47,8 +47,8 @@
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
*ptr++= env;
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2007-01-30 09:34:12 +0100
-+++ scripts/mysql_config.sh 2007-02-07 08:54:33 +0100
+--- scripts/mysql_config.sh.orig 2007-04-04 15:12:23 +0200
++++ scripts/mysql_config.sh 2007-04-13 09:39:03 +0200
@@ -97,9 +97,9 @@
# Create options
@@ -61,43 +61,24 @@
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-30 09:34:03
+0100
-+++ scripts/mysql_create_system_tables.sh 2007-02-07 08:54:33 +0100
-@@ -94,9 +94,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','Y','Y');
-- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');"
- fi
-
- if test ! -f $mdata/host.frm
-@@ -187,17 +184,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','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','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','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','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','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','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','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','Y','Y','','','','',0,0,0);"
+Index: scripts/mysql_system_tables_data.sql
+--- scripts/mysql_system_tables_data.sql.orig 2007-04-04 15:10:36
+0200
++++ scripts/mysql_system_tables_data.sql 2007-04-13 09:44:42 +0200
+@@ -2,10 +2,6 @@
+ -- The inital data for system tables of MySQL Server
+ --
+
+--- default grants for anyone to access database 'test' and 'test_%'
+-INSERT INTO db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+-INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+-
+ -- default users allowing root access from local machine
+ 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','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
Index: sql/Makefile.in
---- sql/Makefile.in.orig 2007-01-30 09:35:40 +0100
-+++ sql/Makefile.in 2007-02-07 08:54:33 +0100
-@@ -501,7 +501,7 @@
+--- sql/Makefile.in.orig 2007-04-04 15:18:53 +0200
++++ sql/Makefile.in 2007-04-13 09:39:03 +0200
+@@ -505,7 +505,7 @@
$(top_builddir)/strings/libmystrings.a
mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 mysql51.spec
--- openpkg-src/mysql51/mysql51.spec 2 Mar 2007 05:35:47 -0000 1.20
+++ openpkg-src/mysql51/mysql51.spec 13 Apr 2007 08:01:26 -0000 1.21
@@ -24,7 +24,7 @@
# package version
%define V_major 5.1
-%define V_minor 16
+%define V_minor 17
%define V_mysql %{V_major}.%{V_minor}-beta
%define V_opkg %{V_major}.%{V_minor}
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20070302
+Release: 20070413
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
