Update mysql5-{client,server} to 5.0.18.

Too many changes to list... more information via:
http://dev.mysql.com/doc/refman/5.0/en/news-5-0-18.html

6 files changed, 44 insertions, 27 deletions

diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index 9862976d7e4..b1d63734b47 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/01/08 17:43:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/09 16:25:01 xtraeme Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		1
+#PKGREVISION=		1
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL 5, a free SQL database (server)
 
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index 2f2dd5895cb..18d448a8698 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/01/08 17:43:58 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/01/09 16:25:01 xtraeme Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -70,6 +70,7 @@ share/mysql-test/include/have_tis620.inc
 share/mysql-test/include/have_ucs2.inc
 share/mysql-test/include/have_ujis.inc
 share/mysql-test/include/im_check_os.inc
+share/mysql-test/include/is_debug_build.inc
 share/mysql-test/include/master-slave.inc
 share/mysql-test/include/mysqltest-x.inc
 share/mysql-test/include/mysqltest_while.inc
@@ -86,6 +87,7 @@ share/mysql-test/include/ps_renew.inc
 share/mysql-test/include/rpl_stmt_seq.inc
 share/mysql-test/include/show_msg.inc
 share/mysql-test/include/show_msg80.inc
+share/mysql-test/include/sp-vars.inc
 share/mysql-test/include/system_db_struct.inc
 share/mysql-test/include/test_outfile.inc
 share/mysql-test/include/testdb_only.inc
@@ -102,6 +104,7 @@ share/mysql-test/lib/mtr_match.pl
 share/mysql-test/lib/mtr_misc.pl
 share/mysql-test/lib/mtr_process.pl
 share/mysql-test/lib/mtr_report.pl
+share/mysql-test/lib/mtr_stress.pl
 share/mysql-test/lib/mtr_timer.pl
 share/mysql-test/mysql-test-run
 share/mysql-test/r/alias.result
@@ -296,6 +299,7 @@ share/mysql-test/r/insert.result
 share/mysql-test/r/insert_select-binlog.result
 share/mysql-test/r/insert_select.result
 share/mysql-test/r/insert_update.result
+share/mysql-test/r/is_debug_build.require
 share/mysql-test/r/isam.result
 share/mysql-test/r/join.result
 share/mysql-test/r/join_crash.result
@@ -510,12 +514,15 @@ share/mysql-test/r/skip_name_resolve.result
 share/mysql-test/r/slave-running.result
 share/mysql-test/r/slave-stopped.result
 share/mysql-test/r/sp-big.result
+share/mysql-test/r/sp-code.result
+share/mysql-test/r/sp-destruct.result
 share/mysql-test/r/sp-dynamic.result
 share/mysql-test/r/sp-error.result
 share/mysql-test/r/sp-goto.result
 share/mysql-test/r/sp-prelocking.result
 share/mysql-test/r/sp-security.result
 share/mysql-test/r/sp-threads.result
+share/mysql-test/r/sp-vars.result
 share/mysql-test/r/sp.result
 share/mysql-test/r/sp_trans.result
 share/mysql-test/r/sql_mode.result
@@ -540,6 +547,8 @@ share/mysql-test/r/timezone.result
 share/mysql-test/r/timezone2.result
 share/mysql-test/r/timezone3.result
 share/mysql-test/r/timezone_grant.result
+share/mysql-test/r/trigger-compat.result
+share/mysql-test/r/trigger-grant.result
 share/mysql-test/r/trigger.result
 share/mysql-test/r/true.require
 share/mysql-test/r/truncate.result
@@ -553,6 +562,7 @@ share/mysql-test/r/type_decimal.result
 share/mysql-test/r/type_enum.result
 share/mysql-test/r/type_float.result
 share/mysql-test/r/type_nchar.result
+share/mysql-test/r/type_newdecimal-big.result
 share/mysql-test/r/type_newdecimal.result
 share/mysql-test/r/type_ranges.result
 share/mysql-test/r/type_set.result
@@ -1057,12 +1067,15 @@ share/mysql-test/t/skip_grants.test
 share/mysql-test/t/skip_name_resolve-master.opt
 share/mysql-test/t/skip_name_resolve.test
 share/mysql-test/t/sp-big.test
+share/mysql-test/t/sp-code.test
+share/mysql-test/t/sp-destruct.test
 share/mysql-test/t/sp-dynamic.test
 share/mysql-test/t/sp-error.test
 share/mysql-test/t/sp-goto.test
 share/mysql-test/t/sp-prelocking.test
 share/mysql-test/t/sp-security.test
 share/mysql-test/t/sp-threads.test
+share/mysql-test/t/sp-vars.test
 share/mysql-test/t/sp.test
 share/mysql-test/t/sp_trans.test
 share/mysql-test/t/sql_mode.test
@@ -1091,6 +1104,8 @@ share/mysql-test/t/timezone2.test
 share/mysql-test/t/timezone3-master.opt
 share/mysql-test/t/timezone3.test
 share/mysql-test/t/timezone_grant.test
+share/mysql-test/t/trigger-compat.test
+share/mysql-test/t/trigger-grant.test
 share/mysql-test/t/trigger.test
 share/mysql-test/t/truncate.test
 share/mysql-test/t/type_binary.test
@@ -1103,6 +1118,7 @@ share/mysql-test/t/type_decimal.test
 share/mysql-test/t/type_enum.test
 share/mysql-test/t/type_float.test
 share/mysql-test/t/type_nchar.test
+share/mysql-test/t/type_newdecimal-big.test
 share/mysql-test/t/type_newdecimal.test
 share/mysql-test/t/type_ranges.test
 share/mysql-test/t/type_set.test
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index 6e1b365d9c0..d75ebf5ca01 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.3 2006/01/08 17:43:58 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2006/01/09 16:25:01 xtraeme Exp $
 
-SHA1 (mysql-5.0.16.tar.gz) = 28f7a20ffefcade3c1cce7250e9d3ea1fa33ab37
-RMD160 (mysql-5.0.16.tar.gz) = ec3108fc8fe043db54329af66a7f99e2da8c716c
-Size (mysql-5.0.16.tar.gz) = 19031670 bytes
-SHA1 (patch-aa) = 5a8dbc480982f6e9bead88a60c714f27584c3e43
+SHA1 (mysql-5.0.18.tar.gz) = e102a5086455c0f80a830e5dfc65acccc5e19a60
+RMD160 (mysql-5.0.18.tar.gz) = 1987df6d9446637c8e353f61e269e9a57d995803
+Size (mysql-5.0.18.tar.gz) = 19169082 bytes
+SHA1 (patch-aa) = fcd1222f9939070a45bbb8ddf72bb1bdadea1f8b
 SHA1 (patch-ab) = 56cd26b3eb125e7d9b7775c9e148118bbd3dc6b3
 SHA1 (patch-ac) = dd8cc3e1fdeba9ca2f6ab1e0a66be79877c43289
 SHA1 (patch-ad) = 36fb22fa10f2d379decf8e6fc86fc966472930e2
 SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-af) = 33c7caa6fe6a61da2a60a63a058cfdbd85af1e2d
-SHA1 (patch-ag) = 0aae848374602101225da51afcf02c4f686136db
-SHA1 (patch-ah) = 5638e1410d35eb36d2adf862718918ebb2eb19eb
+SHA1 (patch-ag) = 1156f793fa6a3097e653c803dca0e3893f72be14
+SHA1 (patch-ah) = 81a8cdd4f3ebea640ee5fa75ab8884c452ed3cd7
 SHA1 (patch-ai) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
 SHA1 (patch-aj) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d
 SHA1 (patch-ak) = 516460b0aa9f641d74f83c5514f258a980033e41
diff --git a/databases/mysql5-server/patches/patch-aa b/databases/mysql5-server/patches/patch-aa
index d4e1014363f..e667053bb52 100644
--- a/databases/mysql5-server/patches/patch-aa
+++ b/databases/mysql5-server/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/09 16:25:01 xtraeme Exp $
 
---- Makefile.in.orig	2005-10-31 09:34:47.000000000 +0100
-+++ Makefile.in	2005-10-31 09:35:11.000000000 +0100
-@@ -359,12 +359,8 @@
+--- Makefile.in.orig	2006-01-09 16:46:08.000000000 +0100
++++ Makefile.in	2006-01-09 16:46:27.000000000 +0100
+@@ -365,12 +365,8 @@
+ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ 			README COPYING EXCEPTIONS-CLIENT
  
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
 -			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack \
diff --git a/databases/mysql5-server/patches/patch-ag b/databases/mysql5-server/patches/patch-ag
index e11c873fafa..03db3570fe6 100644
--- a/databases/mysql5-server/patches/patch-ag
+++ b/databases/mysql5-server/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
+$NetBSD: patch-ag,v 1.3 2006/01/09 16:25:01 xtraeme Exp $
 
---- man/Makefile.in.orig	2005-11-29 21:02:07.000000000 +0100
-+++ man/Makefile.in	2005-11-29 21:02:39.000000000 +0100
+--- man/Makefile.in.orig	2006-01-09 16:47:04.000000000 +0100
++++ man/Makefile.in	2006-01-09 16:47:24.000000000 +0100
 @@ -338,8 +338,8 @@
- yassl_libs = @yassl_libs@
  yassl_libs_with_path = @yassl_libs_with_path@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
 -EXTRA_DIST = $(man1_MANS)
diff --git a/databases/mysql5-server/patches/patch-ah b/databases/mysql5-server/patches/patch-ah
index d42f0b45b6e..c1a061c57cf 100644
--- a/databases/mysql5-server/patches/patch-ah
+++ b/databases/mysql5-server/patches/patch-ah
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
+$NetBSD: patch-ah,v 1.3 2006/01/09 16:25:01 xtraeme Exp $
 
---- include/Makefile.in.orig	2005-12-02 07:54:42.000000000 +0100
-+++ include/Makefile.in	2005-12-02 07:55:26.000000000 +0100
-@@ -343,13 +343,7 @@
- yassl_libs_with_path = @yassl_libs_with_path@
+--- 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 \
@@ -13,7 +13,8 @@ $NetBSD: patch-ah,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 -			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
 -			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
 -			mysql_time.h $(BUILT_SOURCES)
-+pkginclude_HEADERS = 
- 
+-
++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\