summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql4-client/Makefile4
-rw-r--r--databases/mysql4-client/Makefile.common4
-rw-r--r--databases/mysql4-client/distinfo7
-rw-r--r--databases/mysql4-client/patches/patch-az95
-rw-r--r--databases/mysql4-server/MESSAGE12
-rw-r--r--databases/mysql4-server/PLIST36
-rw-r--r--databases/mysql4-server/distinfo10
-rw-r--r--databases/mysql4-server/patches/patch-ab28
-rw-r--r--databases/mysql4-server/patches/patch-as13
9 files changed, 65 insertions, 144 deletions
diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile
index c292aaa3c41..279e464ab85 100644
--- a/databases/mysql4-client/Makefile
+++ b/databases/mysql4-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/01/20 13:37:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2005/02/16 02:21:36 xtraeme Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
-PKGREVISION= 1
+#PKGREVISION= 1
SVR4_PKGNAME= mysqc
COMMENT= MySQL 4, a free SQL database (client)
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index a1ab3412a44..1da6d1f38f9 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.30 2005/01/20 13:37:48 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.31 2005/02/16 02:21:36 xtraeme Exp $
-DISTNAME= mysql-4.1.9
+DISTNAME= mysql-4.1.10
CATEGORIES= databases
MASTER_SITES= http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index bb5d6ec7fa6..02be74df088 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.14 2005/01/20 13:37:48 xtraeme Exp $
+$NetBSD: distinfo,v 1.15 2005/02/16 02:21:36 xtraeme Exp $
-SHA1 (mysql-4.1.9.tar.gz) = e526f301704f8fca7c7e9f42d368ffa1fef2a152
-Size (mysql-4.1.9.tar.gz) = 22308321 bytes
+SHA1 (mysql-4.1.10.tar.gz) = 59590d2a067c40d248fa9ef8689ef51ac46ac261
+Size (mysql-4.1.10.tar.gz) = 22563415 bytes
SHA1 (patch-af) = 40c6d8a8a51bad8f0132bf63dbf865e4a5362504
SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
SHA1 (patch-av) = 4f73104cd3b798103eb2c4f83073dbac02b4db90
SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
SHA1 (patch-ax) = 9e9176468d6d335617862a4d77a358931d7c8c49
SHA1 (patch-ay) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
-SHA1 (patch-az) = b4e2059514e479e27675d68af973386ad9ee5f6d
diff --git a/databases/mysql4-client/patches/patch-az b/databases/mysql4-client/patches/patch-az
deleted file mode 100644
index 4a1d02f55ab..00000000000
--- a/databases/mysql4-client/patches/patch-az
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-az,v 1.1 2005/01/20 13:37:48 xtraeme Exp $
-
-mysqlaccess symlink vulnerability
-
---- scripts/mysqlaccess.sh.orig 2005-01-16 14:28:38 -08:00
-+++ scripts/mysqlaccess.sh 2005-01-16 14:28:38 -08:00
-@@ -2,7 +2,7 @@
- # ****************************
- package MySQLaccess;
- #use strict;
--use POSIX qw(tmpnam);
-+use File::Temp qw(tempfile tmpnam);
- use Fcntl;
-
- BEGIN {
-@@ -32,7 +32,6 @@
- $ACCESS_U_BCK = 'user_backup';
- $ACCESS_D_BCK = 'db_backup';
- $DIFF = '/usr/bin/diff';
-- $TMP_PATH = '/tmp'; #path to writable tmp-directory
- $MYSQLDUMP = '@bindir@/mysqldump';
- #path to mysqldump executable
-
-@@ -432,7 +431,7 @@
- # no caching on STDOUT
- $|=1;
-
-- $MYSQL_CNF = POSIX::tmpnam();
-+ $MYSQL_CNF = tmpnam();
- %MYSQL_CNF = (client => { },
- mysql => { },
- mysqldump => { },
-@@ -577,8 +576,6 @@
- push(@MySQLaccess::Grant::Error,'not_found_mysql') if !(-x $MYSQL);
- push(@MySQLaccess::Grant::Error,'not_found_diff') if !(-x $DIFF);
- push(@MySQLaccess::Grant::Error,'not_found_mysqldump') if !(-x $MYSQLDUMP);
--push(@MySQLaccess::Grant::Error,'not_found_tmp') if !(-d $TMP_PATH);
--push(@MySQLaccess::Grant::Error,'write_err_tmp') if !(-w $TMP_PATH);
- if (@MySQLaccess::Grant::Error) {
- MySQLaccess::Report::Print_Error_Messages() ;
- exit 0;
-@@ -1777,17 +1774,15 @@
- @before = sort(@before);
- @after = sort(@after);
-
-- $before = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.before.$$";
-- $after = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.after.$$";
-- #$after = "/tmp/t0";
-- open(BEFORE,"> $before") ||
-- push(@MySQLaccess::Report::Errors,"Can't open temporary file $before for writing");
-- open(AFTER,"> $after") ||
-- push(@MySQLaccess::Report::Errors,"Can't open temporary file $after for writing");
-- print BEFORE join("\n",@before);
-- print AFTER join("\n",@after);
-- close(BEFORE);
-- close(AFTER);
-+ ($hb, $before) = tempfile("$MySQLaccess::script.XXXXXX") or
-+ push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
-+ ($ha, $after) = tempfile("$MySQLaccess::script.XXXXXX") or
-+ push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
-+
-+ print $hb join("\n",@before);
-+ print $ha join("\n",@after);
-+ close $hb;
-+ close $ha;
-
- # ----------------------------------
- # compute difference
-@@ -1800,8 +1795,8 @@
-
- # ----------------------------------
- # cleanup temp. files
-- unlink(BEFORE);
-- unlink(AFTER);
-+ unlink($before);
-+ unlink($after);
-
- return \@diffs;
- }
-@@ -2316,14 +2311,6 @@
- => "The diff program <$MySQLaccess::DIFF> could not be found.\n"
- ."+ Check your path, or\n"
- ."+ edit the source of this script to point \$DIFF to the diff program.\n"
-- ,'not_found_tmp'
-- => "The temporary directory <$MySQLaccess::TMP_PATH> could not be found.\n"
-- ."+ create this directory (writeable!), or\n"
-- ."+ edit the source of this script to point \$TMP_PATH to the right directory.\n"
-- ,'write_err_tmp'
-- => "The temporary directory <$MySQLaccess::TMP_PATH> is not writable.\n"
-- ."+ make this directory writeable!, or\n"
-- ."+ edit the source of this script to point \$TMP_PATH to another directory.\n"
- ,'Unrecognized_option'
- => "Sorry,\n"
- ."You are using an old version of the mysql-program,\n"
-
diff --git a/databases/mysql4-server/MESSAGE b/databases/mysql4-server/MESSAGE
index 281bf28cd22..4a12e6b477c 100644
--- a/databases/mysql4-server/MESSAGE
+++ b/databases/mysql4-server/MESSAGE
@@ -1,15 +1,11 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/11/18 08:19:01 jklos Exp $
+$NetBSD: MESSAGE,v 1.5 2005/02/16 02:21:37 xtraeme Exp $
-The MySQL directory `${MYSQL_DATADIR}' should be owned by the user
-`${MYSQL_USER}' and group `${MYSQL_GROUP}'. This can be done with:
+You can start the MySQL server doing the following steps:
- chown -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR}
+$ echo "mysqld=yes" >> /etc/rc.conf # NetBSD or a system with rc.d
-If this is a new installation, you will likely want to set up the
-initial database tables by using the following command:
-
- ${PREFIX}/bin/mysql_install_db --user=${MYSQL_USER}
+$ ${RCD_SCRIPTS_DIR}/mysqld start
After the tables are set up and the MySQL server is running,
please remember to set a password for the MySQL root user!
diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST
index 2727a1d0553..7787fe1e39d 100644
--- a/databases/mysql4-server/PLIST
+++ b/databases/mysql4-server/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2005/01/17 14:42:35 xtraeme Exp $
-bin/client_test
+@comment $NetBSD: PLIST,v 1.9 2005/02/16 02:21:37 xtraeme Exp $
bin/comp_err
bin/isamchk
bin/isamlog
@@ -9,6 +8,7 @@ bin/myisamchk
bin/myisamlog
bin/myisampack
bin/mysql.server
+bin/mysql_client_test
bin/mysql_install_db
bin/mysql_secure_installation
bin/mysql_tzinfo_to_sql
@@ -37,6 +37,7 @@ share/mysql-test/client-cert.pem
share/mysql-test/client-key.pem
share/mysql-test/include/check_var_limit.inc
share/mysql-test/include/ctype_common.inc
+share/mysql-test/include/ctype_filesort.inc
share/mysql-test/include/endspace.inc
share/mysql-test/include/have_archive.inc
share/mysql-test/include/have_bdb.inc
@@ -68,13 +69,9 @@ share/mysql-test/include/ps_renew.inc
share/mysql-test/include/system_db_struct.inc
share/mysql-test/install_test_db
share/mysql-test/mysql-test-run
-share/mysql-test/r/rpl_insert_ignore.result
-share/mysql-test/r/rpl_many_optimize.result
-share/mysql-test/t/rpl_insert_ignore-slave.opt
-share/mysql-test/t/rpl_insert_ignore.test
-share/mysql-test/t/rpl_many_optimize.test
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
@@ -130,6 +127,7 @@ 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
@@ -213,10 +211,12 @@ 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.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.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
@@ -245,6 +245,7 @@ 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
@@ -267,6 +268,7 @@ share/mysql-test/r/ndb_limit.result
share/mysql-test/r/ndb_lock.result
share/mysql-test/r/ndb_minmax.result
share/mysql-test/r/ndb_replace.result
+share/mysql-test/r/ndb_restore.result
share/mysql-test/r/ndb_subquery.result
share/mysql-test/r/ndb_transaction.result
share/mysql-test/r/ndb_truncate.result
@@ -285,6 +287,7 @@ 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
@@ -297,6 +300,7 @@ 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/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
@@ -341,18 +345,21 @@ share/mysql-test/r/rpl_heap.result
share/mysql-test/r/rpl_ignore_grant.result
share/mysql-test/r/rpl_init_slave.result
share/mysql-test/r/rpl_insert_id.result
+share/mysql-test/r/rpl_insert_ignore.result
share/mysql-test/r/rpl_loaddata.result
share/mysql-test/r/rpl_loaddata_rule_m.result
share/mysql-test/r/rpl_loaddata_rule_s.result
share/mysql-test/r/rpl_loaddatalocal.result
share/mysql-test/r/rpl_log.result
share/mysql-test/r/rpl_log_pos.result
+share/mysql-test/r/rpl_many_optimize.result
share/mysql-test/r/rpl_master_pos_wait.result
share/mysql-test/r/rpl_max_relay_size.result
share/mysql-test/r/rpl_misc_functions.result
share/mysql-test/r/rpl_multi_delete.result
share/mysql-test/r/rpl_multi_delete2.result
share/mysql-test/r/rpl_multi_update.result
+share/mysql-test/r/rpl_multi_update2.result
share/mysql-test/r/rpl_mystery22.result
share/mysql-test/r/rpl_openssl.result
share/mysql-test/r/rpl_optimize.result
@@ -376,6 +383,7 @@ 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/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
@@ -399,13 +407,16 @@ share/mysql-test/r/timezone3.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
@@ -457,7 +468,6 @@ share/mysql-test/t/bulk_replace.test
share/mysql-test/t/case.test
share/mysql-test/t/cast.test
share/mysql-test/t/check.test
-share/mysql-test/t/client_test.test
share/mysql-test/t/comments.test
share/mysql-test/t/compare.test
share/mysql-test/t/connect.test
@@ -602,6 +612,7 @@ share/mysql-test/t/multi_update.test
share/mysql-test/t/myisam-blob-master.opt
share/mysql-test/t/myisam-blob.test
share/mysql-test/t/myisam.test
+share/mysql-test/t/mysql_client_test.test
share/mysql-test/t/mysql_protocols.test
share/mysql-test/t/mysqlbinlog-master.opt
share/mysql-test/t/mysqlbinlog.test
@@ -624,6 +635,7 @@ share/mysql-test/t/ndb_limit.test
share/mysql-test/t/ndb_lock.test
share/mysql-test/t/ndb_minmax.test
share/mysql-test/t/ndb_replace.test
+share/mysql-test/t/ndb_restore.test
share/mysql-test/t/ndb_subquery.test
share/mysql-test/t/ndb_transaction.test
share/mysql-test/t/ndb_truncate.test
@@ -720,6 +732,8 @@ share/mysql-test/t/rpl_init_slave-slave.opt
share/mysql-test/t/rpl_init_slave.test
share/mysql-test/t/rpl_insert_id-slave.opt
share/mysql-test/t/rpl_insert_id.test
+share/mysql-test/t/rpl_insert_ignore-slave.opt
+share/mysql-test/t/rpl_insert_ignore.test
share/mysql-test/t/rpl_loaddata.test
share/mysql-test/t/rpl_loaddata_rule_m-master.opt
share/mysql-test/t/rpl_loaddata_rule_m.test
@@ -730,6 +744,7 @@ share/mysql-test/t/rpl_log-master.opt
share/mysql-test/t/rpl_log-slave.opt
share/mysql-test/t/rpl_log.test
share/mysql-test/t/rpl_log_pos.test
+share/mysql-test/t/rpl_many_optimize.test
share/mysql-test/t/rpl_master_pos_wait.test
share/mysql-test/t/rpl_max_relay_size.test
share/mysql-test/t/rpl_misc_functions-slave.sh
@@ -739,6 +754,8 @@ share/mysql-test/t/rpl_multi_delete.test
share/mysql-test/t/rpl_multi_delete2-slave.opt
share/mysql-test/t/rpl_multi_delete2.test
share/mysql-test/t/rpl_multi_update.test
+share/mysql-test/t/rpl_multi_update2-slave.opt
+share/mysql-test/t/rpl_multi_update2.test
share/mysql-test/t/rpl_mystery22.test
share/mysql-test/t/rpl_openssl.test
share/mysql-test/t/rpl_optimize.test
@@ -865,6 +882,8 @@ share/mysql/hungarian/errmsg.sys
share/mysql/hungarian/errmsg.txt
share/mysql/italian/errmsg.sys
share/mysql/italian/errmsg.txt
+share/mysql/japanese-sjis/errmsg.sys
+share/mysql/japanese-sjis/errmsg.txt
share/mysql/japanese/errmsg.sys
share/mysql/japanese/errmsg.txt
share/mysql/korean/errmsg.sys
@@ -906,6 +925,7 @@ share/mysql/ukrainian/errmsg.txt
@dirrm share/mysql/norwegian-ny
@dirrm share/mysql/norwegian
@dirrm share/mysql/korean
+@dirrm share/mysql/japanese-sjis
@dirrm share/mysql/japanese
@dirrm share/mysql/italian
@dirrm share/mysql/hungarian
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index dff1ec71ff0..86d357040b5 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.12 2005/01/17 14:42:35 xtraeme Exp $
+$NetBSD: distinfo,v 1.13 2005/02/16 02:21:37 xtraeme Exp $
-SHA1 (mysql-4.1.9.tar.gz) = e526f301704f8fca7c7e9f42d368ffa1fef2a152
-Size (mysql-4.1.9.tar.gz) = 22308321 bytes
+SHA1 (mysql-4.1.10.tar.gz) = 59590d2a067c40d248fa9ef8689ef51ac46ac261
+Size (mysql-4.1.10.tar.gz) = 22563415 bytes
SHA1 (patch-aa) = 1fd6136e4b8212cce4d68bb33c9dcddeca2e3d59
-SHA1 (patch-ab) = 8521d07034428de396ed56529b6c18af50739b9d
+SHA1 (patch-ab) = 0857856085c6d3d498cd404e7f8203a2b4d04ae8
SHA1 (patch-ac) = ba78b6168d79520cc6bee8e06e89ca3fe90d92a1
SHA1 (patch-af) = 2accaca59821f0e82944690f41f905f6560bd76f
SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
SHA1 (patch-am) = 8da1f42e0524512cdba953833420650922a27ccb
SHA1 (patch-aq) = b971690206b416e75046cca3e53f6222b55725c5
SHA1 (patch-ar) = bb3329100655d99484934e69d5c8a7e3dc459542
-SHA1 (patch-as) = 2cf503e557eb6a8534221f6e576f055b9f4b68ce
+SHA1 (patch-as) = a31086086d934e2289b90365c2fd79f1ee059d53
SHA1 (patch-at) = b8a4ad4d4ff8cf04b300c147a68847d1476e607e
SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
SHA1 (patch-aw) = 79b9afbcb16a868c193cded23a50e53987579f27
diff --git a/databases/mysql4-server/patches/patch-ab b/databases/mysql4-server/patches/patch-ab
index 91dc12afb6b..3469c5116fa 100644
--- a/databases/mysql4-server/patches/patch-ab
+++ b/databases/mysql4-server/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-ab,v 1.3 2005/02/16 02:21:37 xtraeme Exp $
---- tests/Makefile.in.orig 2005-01-10 16:09:56.000000000 +0100
-+++ tests/Makefile.in 2005-01-10 16:11:05.000000000 +0100
-@@ -74,7 +74,7 @@
- PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
- am_client_test_OBJECTS = client_test.$(OBJEXT)
- client_test_OBJECTS = $(am_client_test_OBJECTS)
+--- tests/Makefile.in.orig 2005-02-16 03:48:10.000000000 +0100
++++ tests/Makefile.in 2005-02-16 03:49:15.000000000 +0100
+@@ -77,7 +77,7 @@
+ insert_test_LDADD = $(LDADD)
+ am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT)
+ mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
-am__DEPENDENCIES_1 = ../libmysql/libmysqlclient.la
-+am__DEPENDENCIES_1 =
++am__DEPENDENCIES_1 =
am__DEPENDENCIES_2 =
- client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
- insert_test_SOURCES = insert_test.c
-@@ -86,7 +86,7 @@
+ mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
+@@ -87,7 +87,7 @@
thread_test_SOURCES = thread_test.c
thread_test_OBJECTS = thread_test.$(OBJEXT)
thread_test_LDADD = $(LDADD)
@@ -20,12 +20,12 @@ $NetBSD: patch-ab,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -368,7 +368,7 @@
+@@ -373,7 +373,7 @@
# C Test for 4.1 protocol
#
INCLUDES = -I$(top_srcdir)/include $(openssl_includes)
-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
+LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient
- client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
- client_test_SOURCES = client_test.c
+ mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
+ mysql_client_test_SOURCES = mysql_client_test.c
insert_test_DEPENDENCIES = $(LIBRARIES) $(pkglib_LTLIBRARIES)
diff --git a/databases/mysql4-server/patches/patch-as b/databases/mysql4-server/patches/patch-as
index feb80200a3d..2e88825219f 100644
--- a/databases/mysql4-server/patches/patch-as
+++ b/databases/mysql4-server/patches/patch-as
@@ -1,9 +1,9 @@
-$NetBSD: patch-as,v 1.6 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-as,v 1.7 2005/02/16 02:21:37 xtraeme Exp $
---- support-files/Makefile.in.orig 2005-01-10 16:16:28.000000000 +0100
-+++ support-files/Makefile.in 2005-01-10 16:16:50.000000000 +0100
-@@ -338,14 +338,7 @@
- MySQL-shared-compat.spec.sh
+--- support-files/Makefile.in.orig 2005-02-16 03:49:38.000000000 +0100
++++ support-files/Makefile.in 2005-02-16 03:50:06.000000000 +0100
+@@ -343,15 +343,7 @@
+ ndb-config-2-node.ini.sh
SUBDIRS = MacOSX
-pkgdata_DATA = my-small.cnf \
@@ -13,7 +13,8 @@ $NetBSD: patch-as,v 1.6 2005/01/10 15:47:18 xtraeme Exp $
- my-innodb-heavy-4G.cnf \
- mysql-log-rotate \
- mysql-@VERSION@.spec \
-- MySQL-shared-compat.spec
+- MySQL-shared-compat.spec \
+- ndb-config-2-node.ini
+pkgdata_DATA =
pkgdata_SCRIPTS = mysql.server
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 18:15:44 +0000