pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases Updated mysql4-{client,server} to 4.1.10.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ebb971f511a
branches:  trunk
changeset: 489079:4ebb971f511a
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Feb 16 02:21:36 2005 +0000

description:
Updated mysql4-{client,server} to 4.1.10.

A lot of bugfixes and functionality was added... please see:
http://dev.mysql.com/doc/mysql/en/news-4-1-10.html

diffstat:

 databases/mysql4-client/Makefile         |   4 +-
 databases/mysql4-client/Makefile.common  |   4 +-
 databases/mysql4-client/distinfo         |   7 +-
 databases/mysql4-client/patches/patch-az |  95 --------------------------------
 databases/mysql4-server/MESSAGE          |  12 +--
 databases/mysql4-server/PLIST            |  36 +++++++++--
 databases/mysql4-server/distinfo         |  10 +-
 databases/mysql4-server/patches/patch-ab |  28 ++++----
 databases/mysql4-server/patches/patch-as |  13 ++--
 9 files changed, 65 insertions(+), 144 deletions(-)

diffs (truncated from 474 to 300 lines):

diff -r 8bdf6670abb8 -r 4ebb971f511a databases/mysql4-client/Makefile
--- a/databases/mysql4-client/Makefile  Wed Feb 16 00:21:17 2005 +0000
+++ b/databases/mysql4-client/Makefile  Wed Feb 16 02:21:36 2005 +0000
@@ -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 -r 8bdf6670abb8 -r 4ebb971f511a databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common   Wed Feb 16 00:21:17 2005 +0000
+++ b/databases/mysql4-client/Makefile.common   Wed Feb 16 02:21:36 2005 +0000
@@ -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 -r 8bdf6670abb8 -r 4ebb971f511a databases/mysql4-client/distinfo
--- a/databases/mysql4-client/distinfo  Wed Feb 16 00:21:17 2005 +0000
+++ b/databases/mysql4-client/distinfo  Wed Feb 16 02:21:36 2005 +0000
@@ -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 -r 8bdf6670abb8 -r 4ebb971f511a databases/mysql4-client/patches/patch-az
--- a/databases/mysql4-client/patches/patch-az  Wed Feb 16 00:21:17 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 8bdf6670abb8 -r 4ebb971f511a databases/mysql4-server/MESSAGE
--- a/databases/mysql4-server/MESSAGE   Wed Feb 16 00:21:17 2005 +0000
+++ b/databases/mysql4-server/MESSAGE   Wed Feb 16 02:21:36 2005 +0000
@@ -1,15 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/11/18 08:19:01 jklos Exp $
-
-The MySQL directory `${MYSQL_DATADIR}' should be owned by the user
-`${MYSQL_USER}' and group `${MYSQL_GROUP}'.  This can be done with:
+$NetBSD: MESSAGE,v 1.5 2005/02/16 02:21:37 xtraeme Exp $
 
-  chown -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR}
+You can start the MySQL server doing the following steps:
 
-If this is a new installation, you will likely want to set up the 
-initial database tables by using the following command:
+$ echo "mysqld=yes" >> /etc/rc.conf # NetBSD or a system with rc.d
 
-  ${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 -r 8bdf6670abb8 -r 4ebb971f511a databases/mysql4-server/PLIST
--- a/databases/mysql4-server/PLIST     Wed Feb 16 00:21:17 2005 +0000
+++ b/databases/mysql4-server/PLIST     Wed Feb 16 02:21:36 2005 +0000
@@ -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/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-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/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/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/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/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_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/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_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_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_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/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



Home | Main Index | Thread Index | Old Index