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: 14-Feb-2008 19:19:23
Branch: HEAD Handle: 2008021418192200
Modified files:
openpkg-src/mysql51 mysql51.patch mysql51.spec
Log:
upgrading package: mysql51 5.1.22 -> 5.1.23
Summary:
Revision Changes Path
1.10 +29 -52 openpkg-src/mysql51/mysql51.patch
1.27 +2 -2 openpkg-src/mysql51/mysql51.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 mysql51.patch
--- openpkg-src/mysql51/mysql51.patch 1 Oct 2007 06:07:56 -0000 1.9
+++ openpkg-src/mysql51/mysql51.patch 14 Feb 2008 18:19:22 -0000 1.10
@@ -1,12 +1,12 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2007-09-24 12:32:02 +0200
-+++ include/Makefile.in 2007-10-01 07:39:56 +0200
-@@ -395,14 +395,14 @@
+--- include/Makefile.in.orig 2008-01-29 22:43:48 +0100
++++ include/Makefile.in 2008-02-14 18:41:56 +0100
+@@ -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 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 \
@@ -19,50 +19,27 @@
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-09-24 12:30:24 +0200
-+++ include/my_global.h 2007-10-01 07:39:56 +0200
-@@ -562,12 +562,6 @@
- #define PURIFY_OR_LINT_INIT(var)
- #endif
-
--/* Define some useful general macros */
--#if !defined(max)
--#define max(a, b) ((a) > (b) ? (a) : (b))
--#define min(a, b) ((a) < (b) ? (a) : (b))
--#endif
--
- #if !defined(HAVE_UINT)
- #undef HAVE_UINT
- #define HAVE_UINT
-@@ -1508,4 +1502,10 @@
- /* Length of decimal number represented by INT64. */
- #define MY_INT64_NUM_DECIMAL_DIGITS 21
-
-+/* Define some useful general macros */
-+#if !defined(max)
-+#define max(a, b) ((a) > (b) ? (a) : (b))
-+#define min(a, b) ((a) < (b) ? (a) : (b))
-+#endif
-+
- #endif /* my_global_h */
Index: mysys/default.c
---- mysys/default.c.orig 2007-09-24 12:30:12 +0200
-+++ mysys/default.c 2007-10-01 07:39:56 +0200
-@@ -1012,8 +1012,7 @@
- #elif defined(__NETWARE__)
- *ptr++= "sys:/etc/";
- #else
-- *ptr++= "/etc/";
-- *ptr++= "/etc/mysql/";
-+ *ptr++= "@l_prefix@/etc/mysql/";
+--- mysys/default.c.orig 2008-01-29 22:41:43 +0100
++++ mysys/default.c 2008-02-14 18:43:30 +0100
+@@ -1100,12 +1100,11 @@
+ static void init_default_directories_unix()
+ {
+ bzero((char *) default_directories, sizeof(default_directories));
+- ADD_DIRECTORY("/etc/");
+- ADD_DIRECTORY("/etc/mysql/");
+ #ifdef DEFAULT_SYSCONFDIR
+ if (DEFAULT_SYSCONFDIR != "")
+ ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
#endif
- if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
- *ptr++= env;
++ ADD_DIRECTORY("@l_prefix@/etc/mysql/");
+ ADD_COMMON_DIRECTORIES();
+ ADD_DIRECTORY("~/");
+ }
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2007-09-24 12:29:59 +0200
-+++ scripts/mysql_config.sh 2007-10-01 07:39:56 +0200
-@@ -97,9 +97,9 @@
+--- scripts/mysql_config.sh.orig 2008-01-29 22:41:33 +0100
++++ scripts/mysql_config.sh 2008-02-14 10:14:10 +0100
+@@ -102,9 +102,9 @@
# Create options
# We intentionally add a space to the beginning and end of lib strings,
simplifies replace later
@@ -75,9 +52,9 @@
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
Index: scripts/mysql_system_tables_data.sql
---- scripts/mysql_system_tables_data.sql.orig 2007-09-24 12:29:43
+0200
-+++ scripts/mysql_system_tables_data.sql 2007-10-01 07:39:56 +0200
-@@ -5,8 +5,6 @@
+--- scripts/mysql_system_tables_data.sql.orig 2008-01-29 22:41:27
+0100
++++ scripts/mysql_system_tables_data.sql 2008-02-14 10:14:10 +0100
+@@ -11,8 +11,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;
@@ -87,9 +64,9 @@
DROP TABLE tmp_db;
Index: sql/Makefile.in
---- sql/Makefile.in.orig 2007-09-24 12:32:16 +0200
-+++ sql/Makefile.in 2007-10-01 07:39:56 +0200
-@@ -512,7 +512,7 @@
+--- sql/Makefile.in.orig 2008-01-29 22:43:59 +0100
++++ sql/Makefile.in 2008-02-14 10:14:10 +0100
+@@ -513,7 +513,7 @@
$(top_builddir)/strings/libmystrings.a
mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 mysql51.spec
--- openpkg-src/mysql51/mysql51.spec 1 Jan 2008 14:59:23 -0000 1.26
+++ openpkg-src/mysql51/mysql51.spec 14 Feb 2008 18:19:22 -0000 1.27
@@ -23,7 +23,7 @@
# package version
%define V_major 5.1
-%define V_minor 22
+%define V_minor 23
%define V_mysql %{V_major}.%{V_minor}-rc
%define V_opkg %{V_major}.%{V_minor}
@@ -38,7 +38,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20080101
+Release: 20080214
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
