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: 28-Jun-2008 09:39:03
Branch: HEAD Handle: 2008062808390300
Modified files:
openpkg-src/mysql6 mysql6.patch mysql6.spec
Log:
upgrading package: mysql6 6.0.4 -> 6.0.5
Summary:
Revision Changes Path
1.5 +16 -16 openpkg-src/mysql6/mysql6.patch
1.8 +2 -2 openpkg-src/mysql6/mysql6.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/mysql6.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 mysql6.patch
--- openpkg-src/mysql6/mysql6.patch 8 Mar 2008 08:33:18 -0000 1.4
+++ openpkg-src/mysql6/mysql6.patch 28 Jun 2008 07:39:03 -0000 1.5
@@ -1,7 +1,7 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2008-02-13 13:08:18 +0100
-+++ include/Makefile.in 2008-03-08 09:09:34 +0100
-@@ -413,14 +413,14 @@
+--- include/Makefile.in.orig 2008-06-12 15:26:26 +0200
++++ include/Makefile.in 2008-06-27 23:27:03 +0200
+@@ -416,14 +416,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 \
@@ -20,20 +20,20 @@
mysql_version.h.in my_handler.h my_time.h \
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
Index: sql/Makefile.in
---- sql/Makefile.in.orig 2008-02-13 13:08:25 +0100
-+++ sql/Makefile.in 2008-03-08 09:02:38 +0100
-@@ -572,7 +572,7 @@
+--- sql/Makefile.in.orig 2008-06-12 15:26:33 +0200
++++ sql/Makefile.in 2008-06-27 23:31:21 +0200
+@@ -579,7 +579,7 @@
$(top_builddir)/strings/libmystrings.a
- mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
+ mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS)
backup/libbackup.la libndb.la
-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
+LDADD = $(SUPPORTING_LIBS)
mysqld_LDADD = libndb.la \
@MYSQLD_EXTRA_LDFLAGS@ \
@pstack_libs@ $(libevent_libs) \
Index: storage/falcon/BigInt.cpp
---- storage/falcon/BigInt.cpp.orig 2008-02-13 13:06:54 +0100
-+++ storage/falcon/BigInt.cpp 2008-03-08 09:02:38 +0100
+--- storage/falcon/BigInt.cpp.orig 2008-06-12 15:24:42 +0200
++++ storage/falcon/BigInt.cpp 2008-06-27 23:27:03 +0200
@@ -18,11 +18,7 @@
//////////////////////////////////////////////////////////////////////
@@ -47,9 +47,9 @@
#include "Engine.h"
#include "BigInt.h"
Index: storage/falcon/Configuration.cpp
---- storage/falcon/Configuration.cpp.orig 2008-02-13 13:06:37 +0100
-+++ storage/falcon/Configuration.cpp 2008-03-08 09:10:32 +0100
-@@ -360,7 +360,7 @@
+--- storage/falcon/Configuration.cpp.orig 2008-06-12 15:24:40 +0200
++++ storage/falcon/Configuration.cpp 2008-06-27 23:27:03 +0200
+@@ -367,7 +367,7 @@
availableMemory = (uint64) availableMem;
totalMemory = (uint64) physMem;
@@ -59,8 +59,8 @@
int64 physPages = (int64)sysconf(_SC_PHYS_PAGES);
int64 avPhysPages = (int64)sysconf(_SC_AVPHYS_PAGES);
Index: storage/falcon/MemMgr.cpp
---- storage/falcon/MemMgr.cpp.orig 2008-02-13 13:06:34 +0100
-+++ storage/falcon/MemMgr.cpp 2008-03-08 09:13:09 +0100
+--- storage/falcon/MemMgr.cpp.orig 2008-06-12 15:24:29 +0200
++++ storage/falcon/MemMgr.cpp 2008-06-27 23:27:03 +0200
@@ -20,12 +20,7 @@
#include <stdio.h>
@@ -75,8 +75,8 @@
#include "MemMgr.h"
#include "Sync.h"
Index: storage/falcon/Stream.cpp
---- storage/falcon/Stream.cpp.orig 2008-02-13 13:06:20 +0100
-+++ storage/falcon/Stream.cpp 2008-03-08 09:02:38 +0100
+--- storage/falcon/Stream.cpp.orig 2008-06-12 15:24:28 +0200
++++ storage/falcon/Stream.cpp 2008-06-27 23:27:03 +0200
@@ -19,11 +19,7 @@
#include <memory.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/mysql6.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 mysql6.spec
--- openpkg-src/mysql6/mysql6.spec 8 Mar 2008 08:33:18 -0000 1.7
+++ openpkg-src/mysql6/mysql6.spec 28 Jun 2008 07:39:03 -0000 1.8
@@ -23,7 +23,7 @@
# package version
%define V_major 6.0
-%define V_minor 4
+%define V_minor 5
%define V_mysql %{V_major}.%{V_minor}-alpha
%define V_opkg %{V_major}.%{V_minor}
@@ -38,7 +38,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20080308
+Release: 20080628
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
