summaryrefslogtreecommitdiff
path: root/databases/mysql5-server/patches/patch-ab
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2006-08-06 16:30:40 +0000
committertron <tron@pkgsrc.org>2006-08-06 16:30:40 +0000
commite855b440684c20755936491b6decc846051320e4 (patch)
tree651aa1e0a933ec0fcadf09dc6868d7e495d48b3b /databases/mysql5-server/patches/patch-ab
parent74ed7668345789968509bb5cee4b53c7b18f7672 (diff)
downloadpkgsrc-e855b440684c20755936491b6decc846051320e4.tar.gz
Update "mysql5-client" and "mysql5-server" packages to version 5.0.24.
Changes since version 5.0.22: - Security fix: If a user has access to MyISAM table t, that user can create a MERGE table m that accesses t. However, if the user's privileges on t are subsequently revoked, the user can continue to access t by doing so through m. If this behavior is undesirable, you can start the server with the new --skip-merge option to disable the MERGE storage engine. (Bug#15195) - In the INFORMATION_SCHEMA.ROUTINES table the ROUTINE_DEFINITION column now is defined as NULL rather than NOT NULL. Also, NULL rather than the empty string is returned as the column value if the user does not have sufficient privileges to see the routine definition. (Bug#20230) - Several other bug fixes
Diffstat (limited to 'databases/mysql5-server/patches/patch-ab')
-rw-r--r--databases/mysql5-server/patches/patch-ab24
1 files changed, 12 insertions, 12 deletions
diff --git a/databases/mysql5-server/patches/patch-ab b/databases/mysql5-server/patches/patch-ab
index ffe8a4b2fd1..31ad74d2923 100644
--- a/databases/mysql5-server/patches/patch-ab
+++ b/databases/mysql5-server/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2006/08/06 16:30:40 tron Exp $
---- tests/Makefile.in.orig 2005-10-31 09:35:35.000000000 +0100
-+++ tests/Makefile.in 2005-10-31 09:36:29.000000000 +0100
-@@ -100,7 +100,7 @@
- am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
- $(am__objects_1)
+--- tests/Makefile.in.orig 2006-07-27 19:53:37.000000000 +0100
++++ tests/Makefile.in 2006-08-06 16:03:47.000000000 +0100
+@@ -102,7 +102,7 @@
+ @HAVE_NETWARE_TRUE@ mysql_client_test.$(OBJEXT) \
+ @HAVE_NETWARE_TRUE@ $(am__objects_1) my_memmem.$(OBJEXT)
mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la
+am__DEPENDENCIES_1 =
am__DEPENDENCIES_2 =
- mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2)
-@@ -112,7 +112,7 @@
+ @HAVE_NETWARE_FALSE@mysql_client_test_DEPENDENCIES = \
+ @HAVE_NETWARE_FALSE@ $(am__DEPENDENCIES_1) \
+@@ -117,7 +117,7 @@
thread_test_SOURCES = thread_test.c
thread_test_OBJECTS = thread_test.$(OBJEXT)
thread_test_LDADD = $(LDADD)
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -412,8 +412,7 @@
+@@ -420,8 +420,7 @@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes)
@@ -28,5 +28,5 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
- $(top_builddir)/libmysql/libmysqlclient.la
+LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient
- mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
- mysql_client_test_SOURCES = mysql_client_test.c $(yassl_dummy_link_fix)
+ @HAVE_NETWARE_FALSE@mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys
+ @HAVE_NETWARE_TRUE@mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)