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: 16-May-2007 21:44:48
Branch: HEAD Handle: 2007051620444800
Modified files:
openpkg-src/mysql51 mysql51.patch mysql51.spec
Log:
upgrading package: mysql51 5.1.17 -> 5.1.18
Summary:
Revision Changes Path
1.8 +24 -40 openpkg-src/mysql51/mysql51.patch
1.22 +2 -2 openpkg-src/mysql51/mysql51.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 mysql51.patch
--- openpkg-src/mysql51/mysql51.patch 13 Apr 2007 08:01:26 -0000 1.7
+++ openpkg-src/mysql51/mysql51.patch 16 May 2007 19:44:48 -0000 1.8
@@ -1,12 +1,12 @@
Index: include/Makefile.in
---- 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 \
+--- include/Makefile.in.orig 2007-05-08 11:42:16 +0200
++++ include/Makefile.in 2007-05-16 21:28:21 +0200
+@@ -394,14 +394,14 @@
+ decimal.h 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 \
-- m_ctype.h mysql/plugin.h $(HEADERS_GEN)
-+ m_ctype.h mysql/plugin.h rijndael.h sha1.h my_aes.h
$(HEADERS_GEN)
+- m_ctype.h mysql/plugin.h my_attribute.h $(HEADERS_GEN)
++ m_ctype.h mysql/plugin.h my_attribute.h rijndael.h
sha1.h my_aes.h $(HEADERS_GEN)
noinst_HEADERS = config-win.h config-netware.h \
heap.h my_bitmap.h my_uctype.h \
@@ -17,25 +17,11 @@
+ my_nosys.h my_alarm.h queues.h \
+ my_tree.h my_trie.h hash.h thr_alarm.h \
thr_lock.h t_ctype.h violite.h md5.h base64.h \
- mysql_version.h.in my_handler.h my_time.h decimal.h \
+ mysql_version.h.in my_handler.h my_time.h \
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
-Index: include/my_global.h
---- 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
-
--#if !defined(HAVE_ISINF) && !defined(isinf)
-+#undef isinf
- #define isinf(X) 0
--#endif
-
- /* Define missing math constants. */
- #ifndef M_PI
Index: mysys/default.c
---- mysys/default.c.orig 2007-04-04 15:13:42 +0200
-+++ mysys/default.c 2007-04-13 09:39:03 +0200
+--- mysys/default.c.orig 2007-05-08 11:41:21 +0200
++++ mysys/default.c 2007-05-16 21:24:29 +0200
@@ -1011,8 +1011,7 @@
#elif defined(__NETWARE__)
*ptr++= "sys:/etc/";
@@ -47,8 +33,8 @@
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
*ptr++= env;
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2007-04-04 15:12:23 +0200
-+++ scripts/mysql_config.sh 2007-04-13 09:39:03 +0200
+--- scripts/mysql_config.sh.orig 2007-05-08 11:41:08 +0200
++++ scripts/mysql_config.sh 2007-05-16 21:24:29 +0200
@@ -97,9 +97,9 @@
# Create options
@@ -62,23 +48,21 @@
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
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
- --
+--- scripts/mysql_system_tables_data.sql.orig 2007-05-08 11:40:59
+0200
++++ scripts/mysql_system_tables_data.sql 2007-05-16 21:29:50 +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','Y','Y');
+-INSERT INTO tmp_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 SELECT * FROM tmp_db WHERE @had_db_table=0;
+ DROP TABLE tmp_db;
---- 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-04-04 15:18:53 +0200
-+++ sql/Makefile.in 2007-04-13 09:39:03 +0200
-@@ -505,7 +505,7 @@
+--- sql/Makefile.in.orig 2007-05-08 11:42:28 +0200
++++ sql/Makefile.in 2007-05-16 21:24:29 +0200
+@@ -502,7 +502,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.21 -r1.22 mysql51.spec
--- openpkg-src/mysql51/mysql51.spec 13 Apr 2007 08:01:26 -0000 1.21
+++ openpkg-src/mysql51/mysql51.spec 16 May 2007 19:44:48 -0000 1.22
@@ -24,7 +24,7 @@
# package version
%define V_major 5.1
-%define V_minor 17
+%define V_minor 18
%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: 20070413
+Release: 20070516
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
