OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Nov-2007 18:13:26
Branch: HEAD Handle: 2007112317132600
Modified files:
openpkg-src/mysql6 mysql6.patch mysql6.spec
Log:
upgrading package: mysql6 6.0.2 -> 6.0.3
Summary:
Revision Changes Path
1.3 +32 -95 openpkg-src/mysql6/mysql6.patch
1.4 +2 -2 openpkg-src/mysql6/mysql6.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/mysql6.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 mysql6.patch
--- openpkg-src/mysql6/mysql6.patch 5 Sep 2007 07:26:10 -0000 1.2
+++ openpkg-src/mysql6/mysql6.patch 23 Nov 2007 17:13:26 -0000 1.3
@@ -1,12 +1,12 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2007-08-29 20:03:49 +0200
-+++ include/Makefile.in 2007-09-05 09:09:54 +0200
-@@ -397,14 +397,14 @@
+--- include/Makefile.in.orig 2007-11-19 11:37:37 +0100
++++ include/Makefile.in 2007-11-23 11:40:45 +0100
+@@ -396,14 +396,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 my_attribute.h $(HEADERS_GEN)
-+ m_ctype.h mysql/plugin.h my_attribute.h rijndael.h
sha1.h my_aes.h $(HEADERS_GEN)
+- m_ctype.h my_attribute.h $(HEADERS_GEN)
++ m_ctype.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 \
@@ -16,137 +16,74 @@
- my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
+ 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 \
+ thr_lock.h t_ctype.h violite.h my_md5.h base64.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-08-29 20:02:06 +0200
-+++ include/my_global.h 2007-09-05 09:09:54 +0200
-@@ -1485,4 +1485,11 @@
- /* Length of decimal number represented by INT64. */
- #define MY_INT64_NUM_DECIMAL_DIGITS 21
-
-+#ifndef max
-+#define max(a,b) ((a) >= (b) ? (a) : (b))
-+#endif
-+#ifndef min
-+#define min(a,b) ((a) <= (b) ? (a) : (b))
-+#endif
-+
- #endif /* my_global_h */
-Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2007-08-29 20:01:48 +0200
-+++ scripts/mysql_config.sh 2007-09-05 09:09:54 +0200
-@@ -97,9 +97,9 @@
-
- # Create options
- # We intentionally add a space to the beginning and end of lib strings,
simplifies replace later
--libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
-+libs=" $ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@
@NON_THREADED_LIBS@"
- libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
--libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@
@openssl_libs@ "
-+libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @ZLIB_DEPS@ @LIBS@
@openssl_libs@ "
- 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_system_tables_data.sql
---- scripts/mysql_system_tables_data.sql.orig 2007-08-29 20:01:34
+0200
-+++ scripts/mysql_system_tables_data.sql 2007-09-05 09:09:54 +0200
-@@ -2,15 +2,6 @@
- -- The inital data for system tables of MySQL Server
- --
-
---- 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;
--
--
- -- Fill "users" table with default users allowing root access
- -- from local machine if "users" table didn't exist before
- CREATE TEMPORARY TABLE tmp_user LIKE user;
Index: sql/Makefile.in
---- sql/Makefile.in.orig 2007-08-29 20:04:10 +0200
-+++ sql/Makefile.in 2007-09-05 09:09:54 +0200
-@@ -505,7 +505,7 @@
+--- sql/Makefile.in.orig 2007-11-19 11:37:46 +0100
++++ sql/Makefile.in 2007-11-23 11:41:34 +0100
+@@ -515,7 +515,7 @@
$(top_builddir)/strings/libmystrings.a
- mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS)
+ mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
+LDADD = $(SUPPORTING_LIBS)
- mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
+ mysqld_LDADD = libndb.la \
+ @MYSQLD_EXTRA_LDFLAGS@ \
@pstack_libs@ \
- @mysql_plugin_libs@ \
Index: storage/falcon/BigInt.cpp
---- storage/falcon/BigInt.cpp.orig 2007-08-29 20:02:03 +0200
-+++ storage/falcon/BigInt.cpp 2007-09-05 09:09:54 +0200
+--- storage/falcon/BigInt.cpp.orig 2007-11-19 11:36:36 +0100
++++ storage/falcon/BigInt.cpp 2007-11-23 11:42:48 +0100
@@ -18,11 +18,7 @@
//////////////////////////////////////////////////////////////////////
#include <stdio.h>
--#ifndef __APPLE__
--#include <malloc.h>
--#else
+-#if defined(__APPLE__) || defined(__FreeBSD__)
#include <stdlib.h>
+-#else
+-#include <malloc.h>
-#endif
#include <string.h>
#include "Engine.h"
#include "BigInt.h"
Index: storage/falcon/Configuration.cpp
---- storage/falcon/Configuration.cpp.orig 2007-08-29 20:02:03 +0200
-+++ storage/falcon/Configuration.cpp 2007-09-05 09:09:54 +0200
-@@ -287,7 +287,7 @@
-
- availableMemory *= ONE_MB;
+--- storage/falcon/Configuration.cpp.orig 2007-11-19 11:36:22 +0100
++++ storage/falcon/Configuration.cpp 2007-11-23 11:51:26 +0100
+@@ -288,7 +288,7 @@
+
+ availableMemory *= ONE_MB;
*/
-#else
+#elif defined(__linux__)
int32 pageSize = sysconf(_SC_PAGESIZE);
//int32 physPages = sysconf(_SC_PHYS_PAGES);
int32 avPhysPages = sysconf(_SC_AVPHYS_PAGES);
-Index: storage/falcon/DateTime.cpp
---- storage/falcon/DateTime.cpp.orig 2007-08-29 20:01:21 +0200
-+++ storage/falcon/DateTime.cpp 2007-09-05 09:09:54 +0200
-@@ -924,8 +924,10 @@
-
- bool DateTime::isDayLightSavings(tm *time)
- {
-+#if 0
- if (!daylight)
- return false;
-+#endif
-
- // Jan to March and November and December are definitely no
-
Index: storage/falcon/MemMgr.cpp
---- storage/falcon/MemMgr.cpp.orig 2007-08-29 20:01:52 +0200
-+++ storage/falcon/MemMgr.cpp 2007-09-05 09:09:54 +0200
+--- storage/falcon/MemMgr.cpp.orig 2007-11-19 11:36:04 +0100
++++ storage/falcon/MemMgr.cpp 2007-11-23 11:52:18 +0100
@@ -19,11 +19,7 @@
#endif
#include <stdio.h>
--#ifndef __APPLE__
--#include <malloc.h>
--#else
+-#if defined(__APPLE__) || defined(__FreeBSD__)
#include <stdlib.h>
+-#else
+-#include <malloc.h>
-#endif
#include <memory.h>
#include "Engine.h"
#include "MemMgr.h"
Index: storage/falcon/Stream.cpp
---- storage/falcon/Stream.cpp.orig 2007-08-29 20:02:19 +0200
-+++ storage/falcon/Stream.cpp 2007-09-05 09:09:54 +0200
+--- storage/falcon/Stream.cpp.orig 2007-11-19 11:35:53 +0100
++++ storage/falcon/Stream.cpp 2007-11-23 15:30:14 +0100
@@ -19,11 +19,7 @@
#include <memory.h>
#include <string.h>
--#ifndef __APPLE__
--#include <malloc.h>
--#else
+-#if defined(__APPLE__) || defined(__FreeBSD__)
#include <stdlib.h>
+-#else
+-#include <malloc.h>
-#endif
#include <stdio.h>
#include <stdarg.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/mysql6.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 mysql6.spec
--- openpkg-src/mysql6/mysql6.spec 5 Oct 2007 15:32:21 -0000 1.3
+++ openpkg-src/mysql6/mysql6.spec 23 Nov 2007 17:13:26 -0000 1.4
@@ -24,7 +24,7 @@
# package version
%define V_major 6.0
-%define V_minor 2
+%define V_minor 3
%define V_mysql %{V_major}.%{V_minor}-alpha
%define V_opkg %{V_major}.%{V_minor}
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20071005
+Release: 20071123
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
