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: 13-Sep-2008 20:54:44
Branch: HEAD Handle: 2008091319544400
Modified files:
openpkg-src/mysql51 mysql51.patch mysql51.spec
Log:
upgrading package: mysql51 5.1.26 -> 5.1.28
Summary:
Revision Changes Path
1.12 +20 -24 openpkg-src/mysql51/mysql51.patch
1.31 +2 -2 openpkg-src/mysql51/mysql51.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 mysql51.patch
--- openpkg-src/mysql51/mysql51.patch 17 Apr 2008 06:40:45 -0000 1.11
+++ openpkg-src/mysql51/mysql51.patch 13 Sep 2008 18:54:44 -0000 1.12
@@ -1,6 +1,6 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2008-04-08 13:24:47 +0200
-+++ include/Makefile.in 2008-04-17 08:22:19 +0200
+--- include/Makefile.in.orig 2008-08-28 17:43:15 +0200
++++ include/Makefile.in 2008-09-13 18:34:54 +0200
@@ -394,14 +394,14 @@
decimal.h errmsg.h my_global.h my_net.h \
my_getopt.h sslopt-longopts.h my_dir.h \
@@ -20,25 +20,21 @@
mysql_version.h.in my_handler.h my_time.h \
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
Index: mysys/default.c
---- mysys/default.c.orig 2008-04-08 13:23:13 +0200
-+++ mysys/default.c 2008-04-17 08:06:57 +0200
-@@ -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
+--- mysys/default.c.orig 2008-08-28 17:40:47 +0200
++++ mysys/default.c 2008-09-13 18:38:09 +0200
+@@ -1086,8 +1086,7 @@
+
+ #else
+
+- errors += add_directory(alloc, "/etc/", dirs);
+- errors += add_directory(alloc, "/etc/mysql/", dirs);
++ errors += add_directory(alloc, "@l_prefix@/etc/mysql/", dirs);
+
+ #if defined(DEFAULT_SYSCONFDIR)
if (DEFAULT_SYSCONFDIR != "")
- ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
- #endif
-+ ADD_DIRECTORY("@l_prefix@/etc/mysql/");
- ADD_COMMON_DIRECTORIES();
- ADD_DIRECTORY("~/");
- }
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2008-04-08 13:23:12 +0200
-+++ scripts/mysql_config.sh 2008-04-17 08:06:57 +0200
+--- scripts/mysql_config.sh.orig 2008-08-28 17:40:52 +0200
++++ scripts/mysql_config.sh 2008-09-13 18:34:54 +0200
@@ -104,9 +104,9 @@
# Create options
@@ -52,8 +48,8 @@
if [ -r "$pkglibdir/libmygcc.a" ]; then
Index: scripts/mysql_system_tables_data.sql
---- scripts/mysql_system_tables_data.sql.orig 2008-04-08 13:23:10
+0200
-+++ scripts/mysql_system_tables_data.sql 2008-04-17 08:06:57 +0200
+--- scripts/mysql_system_tables_data.sql.orig 2008-08-28 17:40:52
+0200
++++ scripts/mysql_system_tables_data.sql 2008-09-13 18:34:54 +0200
@@ -11,8 +11,6 @@
-- Fill "db" table with default grants for anyone to
-- access database 'test' and 'test_%' if "db" table didn't exist
@@ -64,9 +60,9 @@
DROP TABLE tmp_db;
Index: sql/Makefile.in
---- sql/Makefile.in.orig 2008-04-08 13:24:56 +0200
-+++ sql/Makefile.in 2008-04-17 08:06:57 +0200
-@@ -515,7 +515,7 @@
+--- sql/Makefile.in.orig 2008-08-28 17:43:23 +0200
++++ sql/Makefile.in 2008-09-13 18:34:54 +0200
+@@ -517,7 +517,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.30 -r1.31 mysql51.spec
--- openpkg-src/mysql51/mysql51.spec 13 Jul 2008 06:51:29 -0000 1.30
+++ openpkg-src/mysql51/mysql51.spec 13 Sep 2008 18:54:44 -0000 1.31
@@ -23,7 +23,7 @@
# package version
%define V_major 5.1
-%define V_minor 26
+%define V_minor 28
%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: 20080713
+Release: 20080913
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
