summaryrefslogtreecommitdiff
path: root/databases/mysql5-server/patches
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql5-server/patches')
-rw-r--r--databases/mysql5-server/patches/patch-aa8
-rw-r--r--databases/mysql5-server/patches/patch-ab16
-rw-r--r--databases/mysql5-server/patches/patch-ac16
-rw-r--r--databases/mysql5-server/patches/patch-ad10
-rw-r--r--databases/mysql5-server/patches/patch-ae6
-rw-r--r--databases/mysql5-server/patches/patch-ag10
-rw-r--r--databases/mysql5-server/patches/patch-ah29
-rw-r--r--databases/mysql5-server/patches/patch-ai10
-rw-r--r--databases/mysql5-server/patches/patch-aj20
-rw-r--r--databases/mysql5-server/patches/patch-ak12
-rw-r--r--databases/mysql5-server/patches/patch-al6
-rw-r--r--databases/mysql5-server/patches/patch-am10
-rw-r--r--databases/mysql5-server/patches/patch-an14
-rw-r--r--databases/mysql5-server/patches/patch-ao8
-rw-r--r--databases/mysql5-server/patches/patch-bf8
15 files changed, 90 insertions, 93 deletions
diff --git a/databases/mysql5-server/patches/patch-aa b/databases/mysql5-server/patches/patch-aa
index 0d3c787ef1b..05504a2dc51 100644
--- a/databases/mysql5-server/patches/patch-aa
+++ b/databases/mysql5-server/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2006/10/14 18:41:34 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2007/03/11 18:42:49 adam Exp $
---- Makefile.in.orig 2006-10-14 19:47:57.000000000 +0200
-+++ Makefile.in 2006-10-14 19:48:09.000000000 +0200
-@@ -370,12 +370,8 @@
+--- Makefile.in.orig 2007-03-05 20:23:25.000000000 +0100
++++ Makefile.in
+@@ -372,12 +372,8 @@ AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
diff --git a/databases/mysql5-server/patches/patch-ab b/databases/mysql5-server/patches/patch-ab
index bdf83f77a54..fce429272ff 100644
--- a/databases/mysql5-server/patches/patch-ab
+++ b/databases/mysql5-server/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.3 2006/10/14 18:41:34 xtraeme Exp $
+$NetBSD: patch-ab,v 1.4 2007/03/11 18:42:49 adam Exp $
---- tests/Makefile.in.orig 2006-10-14 19:48:42.000000000 +0200
-+++ tests/Makefile.in 2006-10-14 19:49:16.000000000 +0200
-@@ -99,7 +99,7 @@
+--- tests/Makefile.in.orig 2007-03-05 20:23:23.000000000 +0100
++++ tests/Makefile.in
+@@ -93,7 +93,7 @@ insert_test_LDADD = $(LDADD)
am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
- $(am__objects_1) my_memmem.$(OBJEXT)
+ 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)
-@@ -111,7 +111,7 @@
+@@ -103,7 +103,7 @@ select_test_LDADD = $(LDADD)
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.3 2006/10/14 18:41:34 xtraeme Exp $
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -416,8 +416,7 @@
+@@ -397,8 +397,7 @@ EXTRA_DIST = auto_increment.res auto_inc
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes)
@@ -29,4 +29,4 @@ $NetBSD: patch-ab,v 1.3 2006/10/14 18:41:34 xtraeme Exp $
+LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient
mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
- mysql_client_test_SOURCES = mysql_client_test.c $(yassl_dummy_link_fix) \
+ mysql_client_test_SOURCES = mysql_client_test.c\
diff --git a/databases/mysql5-server/patches/patch-ac b/databases/mysql5-server/patches/patch-ac
index 17d4508e0dd..c8da422b493 100644
--- a/databases/mysql5-server/patches/patch-ac
+++ b/databases/mysql5-server/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.4 2006/10/14 18:41:34 xtraeme Exp $
+$NetBSD: patch-ac,v 1.5 2007/03/11 18:42:49 adam Exp $
---- mysql-test/Makefile.in.orig 2006-10-14 19:50:21.000000000 +0200
-+++ mysql-test/Makefile.in 2006-10-14 19:51:30.000000000 +0200
-@@ -389,7 +389,7 @@
+--- mysql-test/Makefile.in.orig 2007-03-05 20:22:56.000000000 +0100
++++ mysql-test/Makefile.in
+@@ -374,7 +374,7 @@ zlib_dir = @zlib_dir@
@HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
@HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
benchdir_root = $(prefix)
-testdir = $(benchdir_root)/mysql-test
+testdir = $(benchdir_root)/share/mysql-test
- EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
- EXTRA_DIST = $(EXTRA_SCRIPTS)
- GENSCRIPTS = mysql-test-run install_test_db mtr
-@@ -820,12 +820,11 @@
+ EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
+ EXTRA_DIST = $(EXTRA_SCRIPTS)
+ GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr
+@@ -770,12 +770,11 @@ dist-hook:
$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
install-data-local:
diff --git a/databases/mysql5-server/patches/patch-ad b/databases/mysql5-server/patches/patch-ad
index 0f1603af9b9..59a5744ad6d 100644
--- a/databases/mysql5-server/patches/patch-ad
+++ b/databases/mysql5-server/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-ad,v 1.2 2007/03/11 18:42:49 adam Exp $
---- sql/mysqld.cc.orig 2005-10-17 03:27:30.000000000 +0200
-+++ sql/mysqld.cc 2005-10-31 09:57:13.000000000 +0100
-@@ -171,7 +171,7 @@
+--- sql/mysqld.cc.orig 2007-03-05 20:21:11.000000000 +0100
++++ sql/mysqld.cc
+@@ -171,7 +171,7 @@ static void getvolumeID(BYTE *volumeName
int initgroups(const char *,unsigned int);
#endif
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
#include <ieeefp.h>
#ifdef HAVE_FP_EXCEPT // Fix type conflict
typedef fp_except fp_except_t;
-@@ -3276,7 +3276,7 @@
+@@ -3431,7 +3431,7 @@ int main(int argc, char **argv)
init_ssl();
#ifdef HAVE_LIBWRAP
diff --git a/databases/mysql5-server/patches/patch-ae b/databases/mysql5-server/patches/patch-ae
index 7545d80c591..85d8a80ff69 100644
--- a/databases/mysql5-server/patches/patch-ae
+++ b/databases/mysql5-server/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-ae,v 1.2 2007/03/11 18:42:49 adam Exp $
---- mysys/my_gethwaddr.c.orig 2005-10-14 10:21:10.000000000 +0000
+--- mysys/my_gethwaddr.c.orig 2007-03-05 20:21:11.000000000 +0100
+++ mysys/my_gethwaddr.c
-@@ -31,7 +31,7 @@ static my_bool memcpy_and_test(uchar *to
+@@ -30,7 +30,7 @@ static my_bool memcpy_and_test(uchar *to
return res;
}
diff --git a/databases/mysql5-server/patches/patch-ag b/databases/mysql5-server/patches/patch-ag
index ca41472f5ea..30404561ceb 100644
--- a/databases/mysql5-server/patches/patch-ag
+++ b/databases/mysql5-server/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.5 2006/10/14 18:41:34 xtraeme Exp $
+$NetBSD: patch-ag,v 1.6 2007/03/11 18:42:49 adam Exp $
---- man/Makefile.in.orig 2006-10-04 13:25:43.000000000 +0200
-+++ man/Makefile.in 2006-10-14 20:17:36.000000000 +0200
-@@ -344,7 +344,7 @@
+--- man/Makefile.in.orig 2007-03-05 20:22:54.000000000 +0100
++++ man/Makefile.in
+@@ -348,7 +348,7 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
zlib_dir = @zlib_dir@
-man1_MANS = @man1_files@
-+man1_MANS = mysqld.1 mysqld_multi.1
++man1_MANS = mysqld_multi.1
man8_MANS = @man8_files@
EXTRA_DIST = $(man1_MANS) $(man8_MANS)
all: all-am
diff --git a/databases/mysql5-server/patches/patch-ah b/databases/mysql5-server/patches/patch-ah
index c1a061c57cf..8a05691d7a6 100644
--- a/databases/mysql5-server/patches/patch-ah
+++ b/databases/mysql5-server/patches/patch-ah
@@ -1,20 +1,19 @@
-$NetBSD: patch-ah,v 1.3 2006/01/09 16:25:01 xtraeme Exp $
+$NetBSD: patch-ah,v 1.4 2007/03/11 18:42:49 adam Exp $
---- include/Makefile.in.orig 2006-01-09 16:47:58.000000000 +0100
-+++ include/Makefile.in 2006-01-09 16:48:13.000000000 +0100
-@@ -343,14 +343,7 @@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
- BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
--pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
-- mysql.h mysql_com.h mysql_embed.h \
-- my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
-- errmsg.h my_global.h my_net.h my_alloc.h \
-- my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
+--- include/Makefile.in.orig 2007-03-05 20:22:51.000000000 +0100
++++ include/Makefile.in
+@@ -362,13 +362,7 @@ HEADERS_GEN = mysql_version.h my_config.
+ HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
+ my_list.h my_alloc.h typelib.h
+
+-pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
+- my_xml.h mysql_embed.h \
+- my_semaphore.h my_pthread.h my_no_pthread.h raid.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 \
-- mysql_time.h $(BUILT_SOURCES)
--
+- m_ctype.h $(HEADERS_GEN)
+pkginclude_HEADERS =
+
noinst_HEADERS = config-win.h config-os2.h config-netware.h \
heap.h my_bitmap.h\
- myisam.h myisampack.h myisammrg.h ft_global.h\
diff --git a/databases/mysql5-server/patches/patch-ai b/databases/mysql5-server/patches/patch-ai
index 82c7c4cdc5d..1ee4fd0978e 100644
--- a/databases/mysql5-server/patches/patch-ai
+++ b/databases/mysql5-server/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-ai,v 1.2 2007/03/11 18:42:49 adam Exp $
---- include/my_pthread.h.orig 2003-12-14 21:23:47.000000000 +0000
-+++ include/my_pthread.h 2003-12-20 12:09:31.000000000 +0000
-@@ -19,7 +19,13 @@
+--- include/my_pthread.h.orig 2007-03-05 20:21:12.000000000 +0100
++++ include/my_pthread.h
+@@ -18,7 +18,13 @@
#ifndef _my_pthread_h
#define _my_pthread_h
@@ -16,7 +16,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
#ifndef ETIME
#define ETIME ETIMEDOUT /* For FreeBSD */
#endif
-@@ -301,7 +307,11 @@
+@@ -338,7 +344,11 @@ int sigwait(sigset_t *set, int *sig);
#endif
#ifndef HAVE_NONPOSIX_SIGWAIT
diff --git a/databases/mysql5-server/patches/patch-aj b/databases/mysql5-server/patches/patch-aj
index 4b21020e764..37613199cef 100644
--- a/databases/mysql5-server/patches/patch-aj
+++ b/databases/mysql5-server/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $
+$NetBSD: patch-aj,v 1.3 2007/03/11 18:42:50 adam Exp $
---- scripts/mysqld_safe.sh.orig 2006-10-14 19:56:04.000000000 +0200
-+++ scripts/mysqld_safe.sh 2006-10-14 19:59:48.000000000 +0200
-@@ -330,6 +330,14 @@
+--- scripts/mysqld_safe.sh.orig 2007-03-05 20:21:13.000000000 +0100
++++ scripts/mysqld_safe.sh
+@@ -331,6 +331,14 @@ then
ulimit -c $core_file_size
fi
@@ -17,7 +17,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $
#
# If there exists an old pid file, check if the daemon is already running
# Note: The switches to 'ps' may depend on your operating system
-@@ -340,18 +348,16 @@
+@@ -341,18 +349,16 @@ then
then
if @FIND_PROC@
then # The pid contains a mysqld process
@@ -40,7 +40,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $
exit 1
fi
fi
-@@ -364,11 +370,11 @@
+@@ -365,11 +371,11 @@ fi
# Alternatively, you can start mysqld with the "myisam-recover" option. See
# the manual for details.
#
@@ -54,7 +54,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $
# Does this work on all systems?
#if type ulimit | grep "shell builtin" > /dev/null
-@@ -376,7 +382,7 @@
+@@ -377,7 +383,7 @@ echo "Starting $MYSQLD daemon with datab
# ulimit -n 256 > /dev/null 2>&1 # Fix for BSD and FreeBSD systems
#fi
@@ -63,7 +63,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $
while true
do
rm -f $safe_mysql_unix_port $pid_file # Some extra safety
-@@ -388,7 +394,7 @@
+@@ -389,7 +395,7 @@ do
fi
if test ! -f $pid_file # This is removed if normal shutdown
then
@@ -72,7 +72,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $
break
fi
-@@ -401,7 +407,7 @@
+@@ -402,7 +408,7 @@ do
# kill -9 is used or the process won't react on the kill.
numofproces=`ps xaww | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"`
@@ -81,7 +81,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $
I=1
while test "$I" -le "$numofproces"
do
-@@ -414,16 +420,14 @@
+@@ -415,16 +421,14 @@ do
# echo "TEST $I - $T **"
if kill -9 $T
then
diff --git a/databases/mysql5-server/patches/patch-ak b/databases/mysql5-server/patches/patch-ak
index 61a880cbaca..4a21ef03772 100644
--- a/databases/mysql5-server/patches/patch-ak
+++ b/databases/mysql5-server/patches/patch-ak
@@ -1,16 +1,16 @@
-$NetBSD: patch-ak,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-ak,v 1.2 2007/03/11 18:42:50 adam Exp $
---- support-files/Makefile.in.orig 2005-09-27 00:00:34.000000000 +0200
-+++ support-files/Makefile.in 2005-09-27 00:00:57.000000000 +0200
-@@ -345,14 +345,7 @@
+--- support-files/Makefile.in.orig 2007-03-05 20:23:22.000000000 +0100
++++ support-files/Makefile.in
+@@ -379,14 +379,7 @@ EXTRA_DIST = mysql.spec.sh \
ndb-config-2-node.ini.sh
- SUBDIRS = MacOSX
+ SUBDIRS = MacOSX RHEL4-SElinux
-pkgdata_DATA = my-small.cnf \
- my-medium.cnf \
- my-large.cnf \
- my-huge.cnf \
-- my-innodb-heavy-4G.cnf \
+- my-innodb-heavy-4G.cnf \
- mysql-log-rotate \
- binary-configure \
- ndb-config-2-node.ini
diff --git a/databases/mysql5-server/patches/patch-al b/databases/mysql5-server/patches/patch-al
index 0985afee7f1..7b96ff49296 100644
--- a/databases/mysql5-server/patches/patch-al
+++ b/databases/mysql5-server/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2006/05/18 16:11:15 cube Exp $
+$NetBSD: patch-al,v 1.3 2007/03/11 18:42:50 adam Exp $
---- myisam/Makefile.in.orig 2006-04-26 20:31:56.000000000 +0200
+--- myisam/Makefile.in.orig 2007-03-05 20:22:55.000000000 +0100
+++ myisam/Makefile.in
-@@ -157,7 +157,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
+@@ -156,7 +156,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
diff --git a/databases/mysql5-server/patches/patch-am b/databases/mysql5-server/patches/patch-am
index bd99b0b84d9..9c4b08489cd 100644
--- a/databases/mysql5-server/patches/patch-am
+++ b/databases/mysql5-server/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1 2006/01/08 17:43:58 xtraeme Exp $
+$NetBSD: patch-am,v 1.2 2007/03/11 18:42:50 adam Exp $
---- extra/Makefile.in.orig 2006-01-08 18:36:49.000000000 +0100
-+++ extra/Makefile.in 2006-01-08 18:37:00.000000000 +0100
-@@ -431,9 +431,7 @@
+--- extra/Makefile.in.orig 2007-03-05 20:22:41.000000000 +0100
++++ extra/Makefile.in
+@@ -434,9 +434,7 @@ INCLUDES = -I$(top_builddir)/include -I$
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
../dbug/libdbug.a ../strings/libmystrings.a
@@ -12,4 +12,4 @@ $NetBSD: patch-am,v 1.1 2006/01/08 17:43:58 xtraeme Exp $
+BUILT_SOURCES =
pkginclude_HEADERS = $(BUILT_SOURCES)
- CLEANFILES = $(BUILT_SOURCES)
+ DISTCLEANFILES = $(BUILT_SOURCES)
diff --git a/databases/mysql5-server/patches/patch-an b/databases/mysql5-server/patches/patch-an
index a41c60a0607..9c7a7dd1772 100644
--- a/databases/mysql5-server/patches/patch-an
+++ b/databases/mysql5-server/patches/patch-an
@@ -1,10 +1,8 @@
-$NetBSD: patch-an,v 1.1 2006/10/14 18:41:34 xtraeme Exp $
+$NetBSD: patch-an,v 1.2 2007/03/11 18:42:50 adam Exp $
-Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4
-
---- configure.in.orig 2006-10-14 18:56:35.000000000 +0200
-+++ configure.in 2006-10-14 18:58:41.000000000 +0200
-@@ -475,7 +475,7 @@
+--- configure.in.orig 2007-03-05 20:21:13.000000000 +0100
++++ configure.in
+@@ -487,7 +487,7 @@ then
FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
else
case $SYSTEM_TYPE in
@@ -13,7 +11,7 @@ Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4
FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
;;
*darwin*)
-@@ -752,6 +752,8 @@
+@@ -794,6 +794,8 @@ AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(H
# For sem_xxx functions on Solaris 2.6
AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
@@ -22,7 +20,7 @@ Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4
MYSQL_CHECK_ZLIB_WITH_COMPRESS
# For large pages support
-@@ -1077,7 +1079,7 @@
+@@ -1119,7 +1121,7 @@ case $SYSTEM_TYPE in
MAX_C_OPTIMIZE="-O"
fi
;;
diff --git a/databases/mysql5-server/patches/patch-ao b/databases/mysql5-server/patches/patch-ao
index ce93f87d60d..0779dcec2e2 100644
--- a/databases/mysql5-server/patches/patch-ao
+++ b/databases/mysql5-server/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1 2006/04/17 11:21:41 tron Exp $
+$NetBSD: patch-ao,v 1.2 2007/03/11 18:42:50 adam Exp $
---- sql/sql_lex.cc.orig 2006-03-31 18:10:45.000000000 +0100
-+++ sql/sql_lex.cc 2006-04-17 12:09:26.000000000 +0100
-@@ -960,6 +960,9 @@
+--- sql/sql_lex.cc.orig 2007-03-05 20:21:11.000000000 +0100
++++ sql/sql_lex.cc
+@@ -931,6 +931,9 @@ int MYSQLlex(void *arg, void *yythd)
while (lex->ptr != lex->end_of_query &&
((c=yyGet()) != '*' || yyPeek() != '/'))
{
diff --git a/databases/mysql5-server/patches/patch-bf b/databases/mysql5-server/patches/patch-bf
index 78b8659f30a..213259fc610 100644
--- a/databases/mysql5-server/patches/patch-bf
+++ b/databases/mysql5-server/patches/patch-bf
@@ -1,8 +1,8 @@
-$NetBSD: patch-bf,v 1.1 2006/10/14 18:41:34 xtraeme Exp $
+$NetBSD: patch-bf,v 1.2 2007/03/11 18:42:50 adam Exp $
---- bdb/dist/configure.orig 2006-10-08 15:25:31.000000000 +0200
-+++ bdb/dist/configure 2006-10-08 15:26:39.000000000 +0200
-@@ -5038,7 +5038,7 @@ fi
+--- bdb/dist/configure.orig 2007-03-05 20:23:33.000000000 +0100
++++ bdb/dist/configure
+@@ -5039,7 +5039,7 @@ fi
# we're using.
case "$host_os" in
sysv5UnixWare*|sysv5OpenUNIX8*)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 22:49:26 +0000