In message <20030601.163710.45254851.taca@back-street.net>
	on Sun, 01 Jun 2003 16:37:10 +0900 (JST),
	Takahiro Kambe <taca@back-street.net> wrote:
> Thanks.  And current mysql-client and mysql-server should be updated
> to mysql 3.23.56.
I've already made mysql-client for 3.23.56 (but not mysql-server).

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql-client/Makefile,v
retrieving revision 1.22
diff -d -u -p -r1.22 Makefile
--- Makefile	2003/01/20 23:20:36	1.22
+++ Makefile	2003/06/01 14:17:24
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.22 2003/01/20 23:20:36 lukem Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		3
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL, a free SQL database (client)
 
Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql-client/Makefile.common,v
retrieving revision 1.14
diff -d -u -p -r1.14 Makefile.common
--- Makefile.common	2003/03/24 00:57:47	1.14
+++ Makefile.common	2003/06/01 14:17:24
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile.common,v 1.14 2003/03/24 00:57:47 grant Exp $
 
-DISTNAME=		mysql-3.23.49
+DISTNAME=		mysql-3.23.56
 CATEGORIES=		databases
 MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-3.23/ \
 			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-3.23/ \
@@ -13,6 +13,13 @@ EXTRACT_USING_PAX=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !defined(MYSQL_CHARSET)
+MYSQL_CHARSET=		latin1
+.endif
+.if !defined(MYSQL_EXTRA_CHARSET)
+MYSQL_EXTRA_CHARSET=	all
+.endif
+
 # MYSQL_USER		username of the database administrator
 # MYSQL_GROUP		group of the database administrator
 # MYSQL_DATADIR		home directory of the database administrator and
@@ -37,6 +44,9 @@ CONFIGURE_ARGS+=	--without-docs
 CONFIGURE_ARGS+=	--without-debug
 CONFIGURE_ARGS+=	--without-bench
 CONFIGURE_ARGS+=	--with-low-memory
+
+CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET}
+CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET}
 
 CPPFLAGS+=		-Dunix
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql-client/PLIST,v
retrieving revision 1.5
diff -d -u -p -r1.5 PLIST
--- PLIST	2003/01/20 23:20:36	1.5
+++ PLIST	2003/06/01 14:17:24
@@ -27,13 +27,13 @@ include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
+include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
-include/mysql/my_no_pthread.h
 include/mysql/raid.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
@@ -64,7 +64,7 @@ share/mysql/my-huge.cnf
 share/mysql/my-large.cnf
 share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
-share/mysql/mysql-3.23.49.spec
+share/mysql/mysql-${PKGVERSION}.spec
 share/mysql/mysql-log-rotate
 @dirrm share/mysql
 @dirrm lib/mysql
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql-client/distinfo,v
retrieving revision 1.9
diff -d -u -p -r1.9 distinfo
--- distinfo	2002/12/13 14:19:54	1.9
+++ distinfo	2003/06/01 14:17:24
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.9 2002/12/13 14:19:54 tron Exp $
 
-SHA1 (mysql-3.23.49.tar.gz) = 0256331c7aa9388955148f80cdca382f467ad1be
-Size (mysql-3.23.49.tar.gz) = 11844905 bytes
+SHA1 (mysql-3.23.56.tar.gz) = 3260986cacbcd448bc9cb6a47284effc11a370f0
+Size (mysql-3.23.56.tar.gz) = 11434746 bytes
 SHA1 (patch-af) = 5c627852dd12807580825199cdbd9a1ebc320f33
-SHA1 (patch-al) = 8d8738a168233dcf968b02c7c48c0711342ea200
Index: patches/patch-al
===================================================================
RCS file: patch-al
diff -N patch-al
--- /tmp/cvs08994ae	Sun Jun  1 14:17:24 2003
+++ /dev/null	Sun Jun  1 14:16:43 2003
@@ -1,65 +0,0 @@
-$NetBSD: patch-al,v 1.1 2002/12/13 14:19:54 tron Exp $
-
---- libmysql/libmysql.c.orig	Thu Feb 14 18:30:17 2002
-+++ libmysql/libmysql.c	Fri Dec 13 15:11:45 2002
-@@ -886,7 +886,7 @@
-   uint	field,pkt_len;
-   ulong len;
-   uchar *cp;
--  char	*to;
-+  char	*to, *end_to;
-   MYSQL_DATA *result;
-   MYSQL_ROWS **prev_ptr,*cur;
-   NET *net = &mysql->net;
-@@ -924,6 +924,7 @@
-     *prev_ptr=cur;
-     prev_ptr= &cur->next;
-     to= (char*) (cur->data+fields+1);
-+    end_to=to+pkt_len-1;
-     for (field=0 ; field < fields ; field++)
-     {
-       if ((len=(ulong) net_field_length(&cp)) == NULL_LENGTH)
-@@ -933,6 +934,13 @@
-       else
-       {
- 	cur->data[field] = to;
-+        if (len > end_to - to)
-+        {
-+          free_rows(result);
-+          net->last_errno=CR_UNKNOWN_ERROR;
-+          strmov(net->last_error,ER(net->last_errno));
-+          DBUG_RETURN(0);
-+        }
- 	memcpy(to,(char*) cp,len); to[len]=0;
- 	to+=len+1;
- 	cp+=len;
-@@ -967,7 +975,7 @@
- {
-   uint field;
-   ulong pkt_len,len;
--  uchar *pos,*prev_pos;
-+  uchar *pos,*prev_pos, *end_pos;
- 
-   if ((pkt_len=(uint) net_safe_read(mysql)) == packet_error)
-     return -1;
-@@ -975,6 +983,7 @@
-     return 1;				/* End of data */
-   prev_pos= 0;				/* allowed to write at packet[-1] */
-   pos=mysql->net.read_pos;
-+  end_pos=pos+pkt_len;
-   for (field=0 ; field < fields ; field++)
-   {
-     if ((len=(ulong) net_field_length(&pos)) == NULL_LENGTH)
-@@ -984,6 +993,12 @@
-     }
-     else
-     {
-+      if (len > end_pos - pos)
-+      {
-+        mysql->net.last_errno=CR_UNKNOWN_ERROR;
-+        strmov(mysql->net.last_error,ER(mysql->net.last_errno));
-+        return -1;
-+      }
-       row[field] = (char*) pos;
-       pos+=len;
-       *lengths++=len;