diff options
-rw-r--r-- | databases/mysql4-client/MESSAGE | 4 | ||||
-rw-r--r-- | databases/mysql4-client/Makefile.common | 5 | ||||
-rw-r--r-- | databases/mysql4-client/buildlink3.mk | 4 | ||||
-rw-r--r-- | databases/mysql4-client/distinfo | 10 | ||||
-rw-r--r-- | databases/mysql4-client/patches/patch-af | 19 | ||||
-rw-r--r-- | databases/mysql4-server/PLIST | 48 | ||||
-rw-r--r-- | databases/mysql4-server/distinfo | 12 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-ac | 8 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-af | 17 |
9 files changed, 84 insertions, 43 deletions
diff --git a/databases/mysql4-client/MESSAGE b/databases/mysql4-client/MESSAGE index ba909323f2c..a62c2db0cb0 100644 --- a/databases/mysql4-client/MESSAGE +++ b/databases/mysql4-client/MESSAGE @@ -1,10 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2004/12/02 00:42:06 xtraeme Exp $ +$NetBSD: MESSAGE,v 1.2 2005/05/23 14:00:20 xtraeme Exp $ To use the ``mysqlhotcopy'' script, you'll have to install the following packages: - devel/p5-File-Temp databases/p5-DBD-mysql + devel/p5-File-Temp =========================================================================== diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index fe29d6fc7b1..41c9afe92a3 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.39 2005/05/22 20:07:46 jlam Exp $ +# $NetBSD: Makefile.common,v 1.40 2005/05/23 14:00:20 xtraeme Exp $ -DISTNAME= mysql-4.1.11 +DISTNAME= mysql-4.1.12 CATEGORIES= databases MASTER_SITES= http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/ \ ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ @@ -43,6 +43,7 @@ CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no" # We always use our own readline, either system- or pkgsrc-supplied. CONFIGURE_ARGS+= --without-readline +CONFIGURE_ARGS+= --without-libedit # This forces mysql.info _not_ to be rebuilt. CONFIGURE_ARGS+= --without-docs diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk index feb1dac1133..3d121c4750a 100644 --- a/databases/mysql4-client/buildlink3.mk +++ b/databases/mysql4-client/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2005/03/15 15:09:14 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2005/05/23 14:00:20 xtraeme Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= mysql-client .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.mysql-client+= mysql-client>=4.1.7 -BUILDLINK_RECOMMENDED.mysql-client+= mysql-client>=4.1.10a +BUILDLINK_RECOMMENDED.mysql-client+= mysql-client>=4.1.12 BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql4-client BUILDLINK_LIBDIRS.mysql-client?= lib/mysql .endif # MYSQL_CLIENT_BUILDLINK3_MK diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo index 6c6f608727a..1bc841c7236 100644 --- a/databases/mysql4-client/distinfo +++ b/databases/mysql4-client/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.19 2005/04/06 14:13:45 xtraeme Exp $ +$NetBSD: distinfo,v 1.20 2005/05/23 14:00:20 xtraeme Exp $ -SHA1 (mysql-4.1.11.tar.gz) = 3fa4a9afbf56ca39bf4a2e393bc7b7f6b3cbee05 -RMD160 (mysql-4.1.11.tar.gz) = 1e61c58e5a23a39d71a3c8cdc535061560e5485f -Size (mysql-4.1.11.tar.gz) = 22880239 bytes -SHA1 (patch-af) = 40c6d8a8a51bad8f0132bf63dbf865e4a5362504 +SHA1 (mysql-4.1.12.tar.gz) = 2cea7ff988d9b19e8adfb5234164d671f21b0ed9 +RMD160 (mysql-4.1.12.tar.gz) = f0990c34dd7b15aa137cb002c56bf036be00e8ad +Size (mysql-4.1.12.tar.gz) = 17069350 bytes +SHA1 (patch-af) = 2d2f8d6eef794e0d296a1b4fdb118323e4e89b6c SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91 SHA1 (patch-av) = 4f73104cd3b798103eb2c4f83073dbac02b4db90 SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af index a86f7c17def..7162eabe02d 100644 --- a/databases/mysql4-client/patches/patch-af +++ b/databases/mysql4-client/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.6 2005/01/17 14:42:35 xtraeme Exp $ +$NetBSD: patch-af,v 1.7 2005/05/23 14:00:21 xtraeme Exp $ ---- configure.orig 2005-01-17 15:03:22.000000000 +0100 -+++ configure 2005-01-17 15:05:30.000000000 +0100 -@@ -36436,30 +36436,10 @@ +--- configure.orig 2005-05-13 13:34:04.000000000 +0200 ++++ configure 2005-05-23 12:36:42.000000000 +0200 +@@ -37003,30 +37003,10 @@ fi; @@ -33,7 +33,7 @@ $NetBSD: patch-af,v 1.6 2005/01/17 14:42:35 xtraeme Exp $ -@@ -36738,7 +36718,7 @@ +@@ -37304,7 +37284,7 @@ else bench_dirs="" fi @@ -42,3 +42,12 @@ $NetBSD: patch-af,v 1.6 2005/01/17 14:42:35 xtraeme Exp $ # Don't build readline, i have it already +@@ -37421,7 +37401,7 @@ + main () + { + +- char res= *(*rl_completion_entry_function)(0,0); ++ char res=(*rl_completion_entry_function)(0,0); + completion_matches(0,0); + + ; diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST index 788642b2078..ef6dea2eee9 100644 --- a/databases/mysql4-server/PLIST +++ b/databases/mysql4-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2005/05/02 20:33:58 reed Exp $ +@comment $NetBSD: PLIST,v 1.12 2005/05/23 14:00:21 xtraeme Exp $ bin/comp_err bin/isamchk bin/isamlog @@ -31,7 +31,6 @@ lib/mysql/libvio.a libexec/mysqld man/man1/mysqld.1 man/man1/mysqld_multi.1 -share/examples/rc.d/mysqld share/mysql-test/README share/mysql-test/cacert.pem share/mysql-test/client-cert.pem @@ -46,6 +45,7 @@ share/mysql-test/include/have_big5.inc share/mysql-test/include/have_blackhole.inc share/mysql-test/include/have_compress.inc share/mysql-test/include/have_cp1250_ch.inc +share/mysql-test/include/have_cp932.inc share/mysql-test/include/have_crypt.inc share/mysql-test/include/have_csv.inc share/mysql-test/include/have_debug.inc @@ -72,10 +72,19 @@ share/mysql-test/include/ps_query.inc share/mysql-test/include/ps_renew.inc share/mysql-test/include/system_db_struct.inc share/mysql-test/install_test_db +share/mysql-test/lib/init_db.sql +share/mysql-test/lib/mtr_cases.pl +share/mysql-test/lib/mtr_diff.pl +share/mysql-test/lib/mtr_gcov.pl +share/mysql-test/lib/mtr_gprof.pl +share/mysql-test/lib/mtr_io.pl +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/mysql-test-run share/mysql-test/r/alias.result share/mysql-test/r/alter_table.result -share/mysql-test/r/alter_table.result.es share/mysql-test/r/analyse.result share/mysql-test/r/ansi.result share/mysql-test/r/archive.result @@ -113,9 +122,11 @@ share/mysql-test/r/ctype_big5.result share/mysql-test/r/ctype_collate.result share/mysql-test/r/ctype_cp1250_ch.result share/mysql-test/r/ctype_cp1251.result +share/mysql-test/r/ctype_cp932.result share/mysql-test/r/ctype_create.result share/mysql-test/r/ctype_latin1.result share/mysql-test/r/ctype_latin1_de.result +share/mysql-test/r/ctype_latin2.result share/mysql-test/r/ctype_many.result share/mysql-test/r/ctype_mb.result share/mysql-test/r/ctype_recoding.result @@ -123,6 +134,7 @@ share/mysql-test/r/ctype_sjis.result share/mysql-test/r/ctype_tis620.result share/mysql-test/r/ctype_uca.result share/mysql-test/r/ctype_ucs.result +share/mysql-test/r/ctype_ucs_binlog.result share/mysql-test/r/ctype_ujis.result share/mysql-test/r/ctype_utf8.result share/mysql-test/r/date_formats.result @@ -133,7 +145,6 @@ share/mysql-test/r/dirty_close.result share/mysql-test/r/distinct.result share/mysql-test/r/drop.result share/mysql-test/r/drop_temp_table.result -share/mysql-test/r/drop_temp_table.result.es share/mysql-test/r/empty_table.result share/mysql-test/r/endspace.result share/mysql-test/r/errors.result @@ -190,6 +201,7 @@ share/mysql-test/r/have_big5.require share/mysql-test/r/have_blackhole.require share/mysql-test/r/have_compress.require share/mysql-test/r/have_cp1250_ch.require +share/mysql-test/r/have_cp932.require share/mysql-test/r/have_crypt.require share/mysql-test/r/have_csv.require share/mysql-test/r/have_debug.require @@ -218,13 +230,13 @@ share/mysql-test/r/help.result share/mysql-test/r/init_connect.result share/mysql-test/r/innodb-deadlock.result share/mysql-test/r/innodb-lock.result +share/mysql-test/r/innodb-replace.result share/mysql-test/r/innodb.result -share/mysql-test/r/innodb.result.es share/mysql-test/r/innodb_cache.result share/mysql-test/r/innodb_handler.result 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_select.result.es share/mysql-test/r/insert_update.result share/mysql-test/r/isam.result share/mysql-test/r/join.result @@ -254,7 +266,6 @@ share/mysql-test/r/mix_innodb_myisam_binlog.result share/mysql-test/r/multi_statement.result share/mysql-test/r/multi_update.result share/mysql-test/r/myisam-blob.result -share/mysql-test/r/myisam-blob.result.es share/mysql-test/r/myisam.result share/mysql-test/r/mysql_protocols.result share/mysql-test/r/mysqlbinlog.result @@ -268,6 +279,7 @@ share/mysql-test/r/ndb_basic.result share/mysql-test/r/ndb_blob.result share/mysql-test/r/ndb_cache.result share/mysql-test/r/ndb_charset.result +share/mysql-test/r/ndb_database.result share/mysql-test/r/ndb_grant.result share/mysql-test/r/ndb_index.result share/mysql-test/r/ndb_index_ordered.result @@ -297,7 +309,6 @@ share/mysql-test/r/order_fill_sortbuf.result share/mysql-test/r/outfile.result share/mysql-test/r/overflow.result share/mysql-test/r/packet.result -share/mysql-test/r/packet.result.es share/mysql-test/r/preload.result share/mysql-test/r/ps.result share/mysql-test/r/ps_10nestset.result @@ -309,8 +320,8 @@ share/mysql-test/r/ps_4heap.result share/mysql-test/r/ps_5merge.result share/mysql-test/r/ps_6bdb.result share/mysql-test/r/ps_7ndb.result +share/mysql-test/r/ps_grant.result share/mysql-test/r/query_cache.result -share/mysql-test/r/query_cache.result.es share/mysql-test/r/query_cache_merge.result share/mysql-test/r/raid.result share/mysql-test/r/range.result @@ -395,8 +406,8 @@ share/mysql-test/r/rpl_timezone.result share/mysql-test/r/rpl_trunc_binlog.result share/mysql-test/r/rpl_until.result share/mysql-test/r/rpl_user_variables.result +share/mysql-test/r/rpl_variables.result share/mysql-test/r/select.result -share/mysql-test/r/select.result.es share/mysql-test/r/select_found.result share/mysql-test/r/select_safe.result share/mysql-test/r/show_check.result @@ -418,19 +429,17 @@ share/mysql-test/r/temp_table.result 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/true.require share/mysql-test/r/truncate.result share/mysql-test/r/type_blob.result -share/mysql-test/r/type_blob.result.es share/mysql-test/r/type_date.result share/mysql-test/r/type_datetime.result 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_float.result.es share/mysql-test/r/type_nchar.result share/mysql-test/r/type_ranges.result -share/mysql-test/r/type_ranges.result.es share/mysql-test/r/type_set.result share/mysql-test/r/type_time.result share/mysql-test/r/type_timestamp.result @@ -438,6 +447,7 @@ share/mysql-test/r/type_uint.result share/mysql-test/r/type_year.result share/mysql-test/r/union.result share/mysql-test/r/update.result +share/mysql-test/r/user_var-binlog.result share/mysql-test/r/user_var.result share/mysql-test/r/varbinary.result share/mysql-test/r/variables.result @@ -499,10 +509,12 @@ share/mysql-test/t/ctype_big5.test share/mysql-test/t/ctype_collate.test share/mysql-test/t/ctype_cp1250_ch.test share/mysql-test/t/ctype_cp1251.test +share/mysql-test/t/ctype_cp932.test share/mysql-test/t/ctype_create.test share/mysql-test/t/ctype_latin1.test share/mysql-test/t/ctype_latin1_de-master.opt share/mysql-test/t/ctype_latin1_de.test +share/mysql-test/t/ctype_latin2.test share/mysql-test/t/ctype_many.test share/mysql-test/t/ctype_mb.test share/mysql-test/t/ctype_recoding.test @@ -510,6 +522,7 @@ share/mysql-test/t/ctype_sjis.test share/mysql-test/t/ctype_tis620.test share/mysql-test/t/ctype_uca.test share/mysql-test/t/ctype_ucs.test +share/mysql-test/t/ctype_ucs_binlog.test share/mysql-test/t/ctype_ujis.test share/mysql-test/t/ctype_utf8.test share/mysql-test/t/date_formats-master.opt @@ -586,11 +599,13 @@ share/mysql-test/t/init_file.test share/mysql-test/t/innodb-deadlock.test share/mysql-test/t/innodb-lock.test share/mysql-test/t/innodb-master.opt +share/mysql-test/t/innodb-replace.test share/mysql-test/t/innodb.test share/mysql-test/t/innodb_cache-master.opt share/mysql-test/t/innodb_cache.test share/mysql-test/t/innodb_handler.test share/mysql-test/t/insert.test +share/mysql-test/t/insert_select-binlog.test share/mysql-test/t/insert_select.test share/mysql-test/t/insert_update.test share/mysql-test/t/isam.test @@ -645,6 +660,7 @@ share/mysql-test/t/ndb_basic.test share/mysql-test/t/ndb_blob.test share/mysql-test/t/ndb_cache.test share/mysql-test/t/ndb_charset.test +share/mysql-test/t/ndb_database.test share/mysql-test/t/ndb_index.test share/mysql-test/t/ndb_index_ordered.test share/mysql-test/t/ndb_index_unique.test @@ -683,6 +699,7 @@ share/mysql-test/t/ps_4heap.test share/mysql-test/t/ps_5merge.test share/mysql-test/t/ps_6bdb.test share/mysql-test/t/ps_7ndb.test +share/mysql-test/t/ps_grant.test share/mysql-test/t/query_cache.test share/mysql-test/t/query_cache_merge.test share/mysql-test/t/raid.test @@ -814,6 +831,7 @@ share/mysql-test/t/rpl_timezone.test share/mysql-test/t/rpl_trunc_binlog.test share/mysql-test/t/rpl_until.test share/mysql-test/t/rpl_user_variables.test +share/mysql-test/t/rpl_variables.test share/mysql-test/t/select.test share/mysql-test/t/select_found.test share/mysql-test/t/select_safe.test @@ -833,12 +851,14 @@ share/mysql-test/t/system_mysql_db_fix-master.opt share/mysql-test/t/system_mysql_db_fix.test share/mysql-test/t/system_mysql_db_refs.test share/mysql-test/t/tablelock.test +share/mysql-test/t/temp_table-master.opt share/mysql-test/t/temp_table.test share/mysql-test/t/timezone-master.opt share/mysql-test/t/timezone.test 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/truncate.test share/mysql-test/t/type_blob.test share/mysql-test/t/type_date.test @@ -856,6 +876,7 @@ share/mysql-test/t/type_year.test share/mysql-test/t/union-master.opt share/mysql-test/t/union.test share/mysql-test/t/update.test +share/mysql-test/t/user_var-binlog.test share/mysql-test/t/user_var.test share/mysql-test/t/varbinary.test share/mysql-test/t/variables-master.opt @@ -967,5 +988,6 @@ share/mysql/ukrainian/errmsg.txt @dirrm share/mysql-test/t @dirrm share/mysql-test/std_data @dirrm share/mysql-test/r +@dirrm share/mysql-test/lib @dirrm share/mysql-test/include @dirrm share/mysql-test diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo index 15fc0c08f3f..fae4e6a3d44 100644 --- a/databases/mysql4-server/distinfo +++ b/databases/mysql4-server/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.17 2005/04/06 14:13:45 xtraeme Exp $ +$NetBSD: distinfo,v 1.18 2005/05/23 14:00:21 xtraeme Exp $ -SHA1 (mysql-4.1.11.tar.gz) = 3fa4a9afbf56ca39bf4a2e393bc7b7f6b3cbee05 -RMD160 (mysql-4.1.11.tar.gz) = 1e61c58e5a23a39d71a3c8cdc535061560e5485f -Size (mysql-4.1.11.tar.gz) = 22880239 bytes +SHA1 (mysql-4.1.12.tar.gz) = 2cea7ff988d9b19e8adfb5234164d671f21b0ed9 +RMD160 (mysql-4.1.12.tar.gz) = f0990c34dd7b15aa137cb002c56bf036be00e8ad +Size (mysql-4.1.12.tar.gz) = 17069350 bytes SHA1 (patch-aa) = abeac9fcc34ae3f4b9aa52e9b18380db2363155d SHA1 (patch-ab) = 0857856085c6d3d498cd404e7f8203a2b4d04ae8 -SHA1 (patch-ac) = 4f5e5099f8499a8c3c1db28faebea97125ee0121 -SHA1 (patch-af) = 2accaca59821f0e82944690f41f905f6560bd76f +SHA1 (patch-ac) = 25c13c81ac15a254e18507b7ea8074993c8af00d +SHA1 (patch-af) = 15cb787f6127f7b750851282a94515eb684419e1 SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96 SHA1 (patch-am) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d SHA1 (patch-aq) = b971690206b416e75046cca3e53f6222b55725c5 diff --git a/databases/mysql4-server/patches/patch-ac b/databases/mysql4-server/patches/patch-ac index 7fb9d4fa62d..9147adf2dec 100644 --- a/databases/mysql4-server/patches/patch-ac +++ b/databases/mysql4-server/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.3 2005/04/06 14:13:45 xtraeme Exp $ +$NetBSD: patch-ac,v 1.4 2005/05/23 14:00:21 xtraeme Exp $ ---- mysql-test/Makefile.in.orig 2005-04-06 15:57:12.000000000 +0200 -+++ mysql-test/Makefile.in 2005-04-06 15:57:41.000000000 +0200 +--- mysql-test/Makefile.in.orig 2005-05-23 15:39:29.000000000 +0200 ++++ mysql-test/Makefile.in 2005-05-23 15:39:56.000000000 +0200 @@ -362,7 +362,7 @@ @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 + EXTRA_SCRIPTS = mysql-test-run.sh mysql-test-run.pl install_test_db.sh EXTRA_DIST = $(EXTRA_SCRIPTS) test_SCRIPTS = mysql-test-run install_test_db diff --git a/databases/mysql4-server/patches/patch-af b/databases/mysql4-server/patches/patch-af index 83bd13628df..5f95a5f43df 100644 --- a/databases/mysql4-server/patches/patch-af +++ b/databases/mysql4-server/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.7 2005/01/10 15:47:18 xtraeme Exp $ +$NetBSD: patch-af,v 1.8 2005/05/23 14:00:21 xtraeme Exp $ ---- configure.orig 2005-01-10 16:12:40.000000000 +0100 -+++ configure 2005-01-10 16:12:52.000000000 +0100 -@@ -36429,33 +36429,10 @@ +--- configure.orig 2005-05-13 13:34:04.000000000 +0200 ++++ configure 2005-05-23 15:42:07.000000000 +0200 +@@ -37003,33 +37003,10 @@ fi; @@ -36,3 +36,12 @@ $NetBSD: patch-af,v 1.7 2005/01/10 15:47:18 xtraeme Exp $ echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5 +@@ -37421,7 +37398,7 @@ + main () + { + +- char res= *(*rl_completion_entry_function)(0,0); ++ char res=(*rl_completion_entry_function)(0,0); + completion_matches(0,0); + + ; |