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: 05-Sep-2007 09:26:11
Branch: HEAD Handle: 2007090508261000
Modified files:
openpkg-src/mysql6 mysql6.patch mysql6.spec
Log:
upgrading package: mysql6 6.0.0 -> 6.0.2
Summary:
Revision Changes Path
1.2 +73 -97 openpkg-src/mysql6/mysql6.patch
1.2 +2 -2 openpkg-src/mysql6/mysql6.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/mysql6.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 mysql6.patch
--- openpkg-src/mysql6/mysql6.patch 20 May 2007 20:31:01 -0000 1.1
+++ openpkg-src/mysql6/mysql6.patch 5 Sep 2007 07:26:10 -0000 1.2
@@ -1,12 +1,12 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2007-04-26 22:28:24 +0200
-+++ include/Makefile.in 2007-05-20 20:03:20 +0200
-@@ -398,14 +398,14 @@
- errmsg.h my_global.h my_net.h \
+--- 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 @@
+ 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,12 +17,12 @@
+ 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-26 22:26:39 +0200
-+++ include/my_global.h 2007-05-20 20:03:20 +0200
-@@ -1515,4 +1515,11 @@
+--- 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
@@ -35,8 +35,8 @@
+
#endif /* my_global_h */
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2007-04-26 22:26:26 +0200
-+++ scripts/mysql_config.sh 2007-05-20 20:03:20 +0200
+--- 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
@@ -50,34 +50,66 @@
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
Index: scripts/mysql_system_tables_data.sql
---- scripts/mysql_system_tables_data.sql.orig 2007-04-26 22:26:12
+0200
-+++ scripts/mysql_system_tables_data.sql 2007-05-20 20:03:20 +0200
-@@ -2,10 +2,6 @@
+--- 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
--
---- 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');
+--- 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 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);
+-
+ -- 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-04-26 22:28:43 +0200
-+++ sql/Makefile.in 2007-05-20 20:03:20 +0200
-@@ -507,7 +507,7 @@
+--- 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 @@
$(top_builddir)/strings/libmystrings.a
mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS)
--LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@
+-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
+LDADD = $(SUPPORTING_LIBS)
mysqld_LDADD = @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
+@@ -18,11 +18,7 @@
+ //////////////////////////////////////////////////////////////////////
+
+ #include <stdio.h>
+-#ifndef __APPLE__
+-#include <malloc.h>
+-#else
+ #include <stdlib.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;
+ */
+-#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-04-26 22:26:07 +0200
-+++ storage/falcon/DateTime.cpp 2007-05-20 20:57:04 +0200
+--- 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)
@@ -89,89 +121,33 @@
// Jan to March and November and December are definitely no
-Index: storage/falcon/MACAddress.cpp
---- storage/falcon/MACAddress.cpp.orig 2007-04-26 22:26:06 +0200
-+++ storage/falcon/MACAddress.cpp 2007-05-20 21:36:05 +0200
-@@ -25,11 +25,16 @@
-
- #else
- #include <unistd.h>
--#include <net/if.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
-+#include <net/if.h>
- #include <sys/ioctl.h>
- #endif
-
-+#include <my_global.h>
-+#include <my_sys.h>
-+
- #include <stdio.h>
- #include <string.h>
- #include "Engine.h"
-@@ -83,7 +88,7 @@
- if (length > 0 && length <= 8)
- macAddresses [count++] = getAddress (length,
ifTable->table[n].bPhysAddr);
- }
--#else
-+#elif defined(__linux__)
- int fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_IP);
-
- if (fd < 0)
-@@ -99,6 +104,10 @@
- }
-
- close (fd);
-+#else
-+ UCHAR mac[6];
-+ if (my_gethwaddr(mac) == 0)
-+ macAddresses[count++] = getAddress(6, (UCHAR *)mac);
- #endif
-
- return count;
Index: storage/falcon/MemMgr.cpp
---- storage/falcon/MemMgr.cpp.orig 2007-04-26 22:26:29 +0200
-+++ storage/falcon/MemMgr.cpp 2007-05-20 21:36:46 +0200
-@@ -19,7 +19,7 @@
+--- storage/falcon/MemMgr.cpp.orig 2007-08-29 20:01:52 +0200
++++ storage/falcon/MemMgr.cpp 2007-09-05 09:09:54 +0200
+@@ -19,11 +19,7 @@
#endif
#include <stdio.h>
+-#ifndef __APPLE__
-#include <malloc.h>
-+#include <stdlib.h>
+-#else
+ #include <stdlib.h>
+-#endif
#include <memory.h>
#include "Engine.h"
#include "MemMgr.h"
Index: storage/falcon/Stream.cpp
---- storage/falcon/Stream.cpp.orig 2007-04-26 22:26:40 +0200
-+++ storage/falcon/Stream.cpp 2007-05-20 22:03:41 +0200
-@@ -19,7 +19,7 @@
+--- storage/falcon/Stream.cpp.orig 2007-08-29 20:02:19 +0200
++++ storage/falcon/Stream.cpp 2007-09-05 09:09:54 +0200
+@@ -19,11 +19,7 @@
#include <memory.h>
#include <string.h>
+-#ifndef __APPLE__
-#include <malloc.h>
-+#include <stdlib.h>
+-#else
+ #include <stdlib.h>
+-#endif
#include <stdio.h>
#include <stdarg.h>
#include "Engine.h"
-Index: storage/falcon/Thread.cpp
---- storage/falcon/Thread.cpp.orig 2007-04-26 22:26:13 +0200
-+++ storage/falcon/Thread.cpp 2007-05-20 22:08:44 +0200
-@@ -244,7 +244,7 @@
-
- #ifdef _PTHREADS
- if (!thread->threadId)
-- thread->threadId = pthread_self();
-+ thread->threadId = (long unsigned int)pthread_self();
- #endif
-
- return thread;
-@@ -335,7 +335,7 @@
- pthread_attr_t attributes;
- pthread_attr_init(&attributes);
- pthread_attr_setdetachstate(&attributes, PTHREAD_CREATE_DETACHED);
-- int ret = pthread_create (&threadId, &attributes, thread, this);
-+ int ret = pthread_create ((pthread **)&threadId, &attributes, thread,
this);
- pthread_attr_destroy(&attributes);
-
- if (ret)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/mysql6.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 mysql6.spec
--- openpkg-src/mysql6/mysql6.spec 20 May 2007 20:31:01 -0000 1.1
+++ openpkg-src/mysql6/mysql6.spec 5 Sep 2007 07:26:10 -0000 1.2
@@ -24,7 +24,7 @@
# package version
%define V_major 6.0
-%define V_minor 0
+%define V_minor 2
%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: 20070520
+Release: 20070905
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
