[Midnightbsd-cvs] mports: databases/mysql51-server: Got to mysql 5.1.23
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Apr 1 13:54:24 EDT 2008
Log Message:
-----------
Got to mysql 5.1.23
Modified Files:
--------------
mports/databases/mysql51-server:
Makefile (r1.6 -> r1.7)
distinfo (r1.4 -> r1.5)
pkg-plist (r1.4 -> r1.5)
pkg-plist.client (r1.2 -> r1.3)
mports/databases/mysql51-server/files:
patch-Docs::Makefile.in (r1.1 -> r1.2)
patch-Makefile.in (r1.4 -> r1.5)
patch-mysys_default.c (r1.2 -> r1.3)
Removed Files:
-------------
mports/databases/mysql51-server/files:
patch-include_my_global.h
-------------- next part --------------
Index: pkg-plist.client
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/pkg-plist.client,v
retrieving revision 1.2
retrieving revision 1.3
diff -L databases/mysql51-server/pkg-plist.client -L databases/mysql51-server/pkg-plist.client -u -r1.2 -r1.3
--- databases/mysql51-server/pkg-plist.client
+++ databases/mysql51-server/pkg-plist.client
@@ -46,11 +46,11 @@
lib/mysql/libmysqlclient.a
lib/mysql/libmysqlclient.la
lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.15
+lib/mysql/libmysqlclient.so.16
lib/mysql/libmysqlclient_r.a
lib/mysql/libmysqlclient_r.la
lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.15
+lib/mysql/libmysqlclient_r.so.16
share/aclocal/mysql.m4
%%DATADIR%%/mysql_fix_privilege_tables.sql
@dirrm include/mysql
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/pkg-plist,v
retrieving revision 1.4
retrieving revision 1.5
diff -L databases/mysql51-server/pkg-plist -L databases/mysql51-server/pkg-plist -u -r1.4 -r1.5
--- databases/mysql51-server/pkg-plist
+++ databases/mysql51-server/pkg-plist
@@ -1,4 +1,4 @@
- at comment @stopdaemon mysql-server
+ at stopdaemon mysql-server
bin/innochecksum
bin/my_print_defaults
bin/myisam_ftdump
@@ -132,6 +132,7 @@
%%DATADIR%%/mysql_system_tables_data.sql
%%DATADIR%%/mysql-log-rotate
%%DATADIR%%/mysql.server
+%%DATADIR%%/mysqld_multi.server
%%DATADIR%%/ndb-config-2-node.ini
%%DATADIR%%/norwegian-ny/errmsg.sys
%%DATADIR%%/norwegian/errmsg.sys
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L databases/mysql51-server/Makefile -L databases/mysql51-server/Makefile -u -r1.6 -r1.7
--- databases/mysql51-server/Makefile
+++ databases/mysql51-server/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.1.20
+PORTVERSION= 5.1.23
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.1
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/distinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -L databases/mysql51-server/distinfo -L databases/mysql51-server/distinfo -u -r1.4 -r1.5
--- databases/mysql51-server/distinfo
+++ databases/mysql51-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.20-beta.tar.gz) = 1a3883347040de3990c152d7aceabccb
-SHA256 (mysql-5.1.20-beta.tar.gz) = 6f852c5d6fad17799cf125d19bb5e333e59b14e1d2aa8c85058990082de927d8
-SIZE (mysql-5.1.20-beta.tar.gz) = 25615303
+MD5 (mysql-5.1.23-rc.tar.gz) = d6ca3009eee24a8e396b8f667b3bd8df
+SHA256 (mysql-5.1.23-rc.tar.gz) = 713ca3fa746d99618833ed314868d294e308b38419aa4c72eb64deda97799fec
+SIZE (mysql-5.1.23-rc.tar.gz) = 27263946
Index: patch-mysys_default.c
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/patch-mysys_default.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L databases/mysql51-server/files/patch-mysys_default.c -L databases/mysql51-server/files/patch-mysys_default.c -u -r1.2 -r1.3
--- databases/mysql51-server/files/patch-mysys_default.c
+++ databases/mysql51-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig Tue Jan 30 09:34:13 2007
-+++ mysys/default.c Sat Feb 3 17:12:31 2007
-@@ -608,7 +608,7 @@
+--- mysys/default.c.orig 2008-01-29 22:41:43.000000000 +0100
++++ mysys/default.c 2008-02-14 11:03:21.000000000 +0100
+@@ -623,7 +623,7 @@
{
MY_STAT stat_info;
if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,15 +9,12 @@
/*
Ignore world-writable regular files.
This is mainly done to protect us to not read a file created by
-@@ -1013,9 +1013,9 @@
- #else
- *ptr++= "/etc/";
- *ptr++= "/etc/mysql/";
-+ *ptr++= "%%PREFIX%%/etc/";
-+ *ptr++= "%%PREFIX%%/etc/mysql/";
- #endif
-- if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
-- *ptr++= env;
- *ptr++= ""; /* Place for defaults_extra_file */
- #if !defined(__WIN__) && !defined(__NETWARE__)
- *ptr++= "~/";;
+@@ -1102,6 +1102,8 @@
+ bzero((char *) default_directories, sizeof(default_directories));
+ ADD_DIRECTORY("/etc/");
+ ADD_DIRECTORY("/etc/mysql/");
++ ADD_DIRECTORY("%%PREFIX%%/etc/");
++ ADD_DIRECTORY("%%PREFIX%%/etc/mysql/");
+ #ifdef DEFAULT_SYSCONFDIR
+ if (DEFAULT_SYSCONFDIR != "")
+ ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
--- databases/mysql51-server/files/patch-include_my_global.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- include/my_global.h.orig Mon Jul 2 08:06:55 2007
-+++ include/my_global.h Mon Jul 2 08:07:53 2007
-@@ -561,12 +561,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,5 +1502,11 @@
-
- /* 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: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/patch-Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -L databases/mysql51-server/files/patch-Makefile.in -L databases/mysql51-server/files/patch-Makefile.in -u -r1.4 -r1.5
--- databases/mysql51-server/files/patch-Makefile.in
+++ databases/mysql51-server/files/patch-Makefile.in
@@ -1,12 +1,12 @@
---- Makefile.in.orig Tue May 8 11:43:16 2007
-+++ Makefile.in Thu May 17 09:28:15 2007
-@@ -396,14 +396,7 @@
+--- Makefile.in.orig 2008-01-29 22:44:32.000000000 +0100
++++ Makefile.in 2008-02-14 08:23:39.000000000 +0100
+@@ -398,14 +398,7 @@
EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
- @readline_topdir@ sql-common scripts \
-- @thread_dirs@ pstack \
+- @pstack_dir@ \
- @sql_union_dirs@ unittest storage plugin \
- @sql_server@ @man_dirs@ tests \
- netware @libmysqld_dirs@ \
@@ -14,5 +14,5 @@
- win
+SUBDIRS =
- DIST_SUBDIRS = $(SUBDIRS) BUILD debian
- DISTCLEANFILES = ac_available_languages_fragment
+ DIST_SUBDIRS = . include Docs zlib \
+ cmd-line-utils sql-common scripts \
Index: patch-Docs::Makefile.in
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/patch-Docs::Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/mysql51-server/files/patch-Docs::Makefile.in -L databases/mysql51-server/files/patch-Docs::Makefile.in -u -r1.1 -r1.2
--- databases/mysql51-server/files/patch-Docs::Makefile.in
+++ databases/mysql51-server/files/patch-Docs::Makefile.in
@@ -1,15 +1,15 @@
---- Docs/Makefile.in.orig Fri Jun 2 20:02:56 2006
-+++ Docs/Makefile.in Thu Jun 15 07:18:41 2006
-@@ -370,7 +370,7 @@
- # generated files explicitly in DISTCLEANFILES.
- DISTCLEANFILES = $(TXT_FILES)
- GT = $(srcdir)/generate-text-files.pl
+--- Docs/Makefile.in.orig 2008-01-29 22:43:40.000000000 +0100
++++ Docs/Makefile.in 2008-02-14 08:21:57.000000000 +0100
+@@ -368,7 +368,7 @@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+ EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@
-all: all-am
+all:
.SUFFIXES:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-@@ -458,7 +458,7 @@
+@@ -453,7 +453,7 @@
install-data: install-data-am
uninstall: uninstall-am
More information about the Midnightbsd-cvs
mailing list