Update mysql to 3.23.39.

Disable the mysql-test stuff entirely.

Sync mysql-client's patch-af with mysql-server's.

Changes in release 3.23.39
--------------------------

* If one dropped and added an `AUTO_INCREMENT' column, the
`AUTO_INCREMENT' sequence wasn't reset.
* `CREATE .. SELECT' now creates not unique indexes delayed.
* Fixed problem where `LOCK TABLES table_name READ' followed by
`FLUSH TABLES' put a exclusive lock on the table.
* `REAL' @variables with was represented with 2 digits when
converted to strings.
* Fixed problem that client 'hung' when `LOAD TABLE FROM MASTER'
failed.
* Running `myisamchk --fast --force' will no longer repair tables
that only had the open count wrong.
* Added functions to handle symbolic links to make life easier in
4.0.
* We are now using the `-lcma' thread library on HP-UX 10.20 to get
*MySQL* more stable on HP-UX.
* Fixed problem with `IF()' and number of decimals in the result.
* Fixed date-part extraction functions to work with dates where day
and/or month is 0.
* Extended argument length in option files from 256 to 512 chars.
* Fixed problem with shutdown when `INSERT DELAYED' was waiting for
a `LOCK TABLE'.
* Fixed coredump bug in InnoDB when tablespace was full.
* Fixed problem with `MERGE' tables and big tables (> 4G) when using
`ORDER BY'.

Changes in release 3.23.38
--------------------------

* Fixed a bug when `SELECT' from `MERGE' table sometimes results in
incorrectly ordered rows.
* Fixed a bug in `REPLACE()' when using the ujis character set.
* Applied Sleepycat BDB patches 3.2.9.1 and 3.2.9.2.
* Added option `--skip-stack-trace' to `mysqld'.
* `CREATE TEMPORARY' now works with `InnoDB' tables.
* `InnoDB' now promotes sub keys to whole keys.
* Added option `CONCURRENT' to `LOAD DATA'.
* Better error message when slave `max_allowed_packet' is too low to
read a very long log event from the master.
* Fixed bug when too many rows where removed when using `SELECT
DISTINCT ... HAVING'.
* `SHOW CREATE TABLE' now returns `TEMPORARY' for temporary tables.
* Added `Rows_examined' to slow query log.
* Fixed problems with function returning empty string when using
together with a group functions and a `WHERE' that didn't match
any rows.
* New program `mysqlcheck'.
* Added database name to output for administrative commands like
`CHECK', `REPAIR', `OPTIMIZE'.
* Lots of portability fixes for InnoDB.
* Changed optimizer so that queries like `SELECT * FROM
table_name,table_name2 ... ORDER BY key_part1 LIMIT #' will use
index on `key_part1' instead of `filesort'.
* Fixed bug when doing `LOCK TABLE to_table WRITE,...; INSERT INTO
to_table... SELECT ...' when `to_table' was empty.
* Fixed bug with `LOCK TABLE' and BDB tables.

Changes in release 3.23.37
--------------------------

* Fixed a bug when using `MATCH' in `HAVING' clause.
* Fixed a bug when using `HEAP' tables with `LIKE'.
* Added `--mysql-version' to `safe_mysqld'
* Changed `INNOBASE' to `InnoDB' (because the `INNOBASE' name was
already used). All `configure' options and `mysqld' start options
are now using `innodb' instead of `innobase'. This means that you
have to change any configuration files where you have used
`innobase' options before upgrading to this version!
* Fixed bug when using indexes on `CHAR(255) NULL' columns.
* Slave thread will now be started even if `master-host' is not set,
as long as `server-id' is set and valid `master.info' is present
* Partial updates (terminated with kill) are now logged with a
special error code to the binary log. Slave will refuse to execute
them if the error code indicates the update was terminated
abnormally, and will have to be recovered with `SET
SQL_SLAVE_SKIP_COUNTER=1; SLAVE START' after a manual sanity
check/correction of data integrity.
* Fixed bug that erroneously logged a drop of internal temporary
table on thread termination to the binary log - bug affected
replication.
* Fixed a bug in `REGEXP()' on 64-bit machines.
* `UPDATE' and `DELETE' with `WHERE unique_key_part IS NULL' didn't
update/delete all rows.
* Disabled `INSERT DELAYED' for tables that support transactions.
* Fixed bug when using date functions on `TEXT'/`BLOB' column with
wrong date format.
* UDFs now also work on Windows. (Patch by Ralph Mason)
* Fixed bug in `ALTER TABLE' and `LOAD DATA INFILE' that disabled
key-sorting. These commands should now be faster in most cases.
* Fixed performance bug where reopened tables (tables that had been
waiting for `FLUSH' or `REPAIR') would not use indexes for the
next query.
* Fixed problem with `ALTER TABLE' to Innobase tables on FreeBSD.
* Added `mysqld' variables `myisam_max_sort_file_size' and
`myisam_max_extra_sort_file_size'.
* Initialize signals early to avoid problem with signals in Innobase.
* Applied patch for the `tis620' character set to make comparisons
case-independent and to fix a bug in `LIKE' for this character set.
*NOTE*: All tables that uses the `tis620' character set must be
fixed with  `myisamchk -r' or `REPAIR TABLE' !
* Added `--skip-safemalloc' option to `mysqld'.

Changes in release 3.23.36
--------------------------

* Fixed a bug that allowed you to use database names containing a `.'
character.  This fixes a serious security issue when `mysqld' is
run as root.
* Fixed bug when thread creation failed (could happen when doing a
LOT of connections in a short time).
* Fixed some problems with `FLUSH TABLES' and `TEMPORARY' tables.
(Problem with freeing the key cache and error `Can't reopen
table...').
* Fixed a problem in Innobase with other character sets than `latin1'
and another problem when using many columns.
* Fixed bug that caused a core dump when using a very complex query
involving `DISTINCT' and summary functions.
* Added `SET TRANSACTION ISOLATION LEVEL ...'
* Added `SELECT ... FOR UPDATE'.
* Fixed bug where the number of affected rows was not returned when
`MySQL' was compiled without transaction support.
* Fixed a bug in `UPDATE' where keys weren't always used to find the
rows to be updated.
* Fixed a bug in `CONCAT_WS()' where it returned wrong results.
* Changed `CREATE ... INSERT' and `INSERT ... SELECT' to not allow
concurrent inserts as this could make the binary log hard to
repeat.  (Concurrent inserts are enabled if you are not using the
binary or update log).
* Changed some macros to be able to use fast mutex with glibc 2.2.

9 files changed, 82 insertions, 34 deletions

diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index 6dc7ab51a58..c9b806c9e88 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2001/06/11 06:34:24 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2001/07/08 13:59:14 bad Exp $
 
-DISTNAME=		mysql-3.23.35
+DISTNAME=		mysql-3.23.39
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.mysql.com/MySQL-3.23/ \
 			http://www.mysql.com/Downloads/MySQL-3.23/ \
diff --git a/databases/mysql-client/distinfo b/databases/mysql-client/distinfo
index 9e8314613d2..2059e444034 100644
--- a/databases/mysql-client/distinfo
+++ b/databases/mysql-client/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/05/02 08:22:28 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/07/08 13:59:14 bad Exp $
 
-SHA1 (mysql-3.23.35.tar.gz) = c1532aa954d613d0a4ebdae046ae23427e4ee327
-Size (mysql-3.23.35.tar.gz) = 10929885 bytes
-SHA1 (patch-af) = c8b613527e92c4a9c85992c135dd35e330580d23
+SHA1 (mysql-3.23.39.tar.gz) = bca088128d17f2274cff16bc0c4aaf383d5c27f1
+Size (mysql-3.23.39.tar.gz) = 11211077 bytes
+SHA1 (patch-af) = e21b8898e24a1d576f8301b0bf9363f648d81b61
diff --git a/databases/mysql-client/patches/patch-af b/databases/mysql-client/patches/patch-af
index 4ce9bf24133..33e841fdf2b 100644
--- a/databases/mysql-client/patches/patch-af
+++ b/databases/mysql-client/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2001/05/02 08:22:30 jlam Exp $
+$NetBSD: patch-af,v 1.2 2001/07/08 13:59:15 bad Exp $
 
---- configure.orig	Thu Mar 15 19:52:05 2001
-+++ configure
-@@ -5004,7 +5004,10 @@
+--- configure.orig	Tue Jun 12 21:07:37 2001
++++ configure	Sat Jul  7 23:37:20 2001
+@@ -5065,7 +5065,10 @@
  #define HAVE_LIBWRAP 1
  EOF
  
@@ -14,7 +14,15 @@ $NetBSD: patch-af,v 1.1 2001/05/02 08:22:30 jlam Exp $
  else
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
-@@ -9345,7 +9348,11 @@
+@@ -9554,7 +9557,6 @@
+ else
+   bench_dirs=""
+ fi
+-bench_dirs="$bench_dirs mysql-test"
+ 
+ 
+ # Don't build readline, i have it already
+@@ -9575,7 +9577,11 @@
    # This requires readline to be in a standard place. Mosty for linux
    # there readline may be a shared library.
    readline_dir=""
@@ -27,12 +35,21 @@ $NetBSD: patch-af,v 1.1 2001/05/02 08:22:30 jlam Exp $
  fi
  
  
-@@ -10466,7 +10473,7 @@
+@@ -10745,15 +10751,15 @@
  
      MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
      
 -    MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
 +    MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
      
-     LIBS="$MT_LD_ADD $LIBS"
+-    LIBS="$MT_LD_ADD $LIBS"
      echo ""
+     echo "Configuring MIT Pthreads"
+     # We will never install so installation paths are not needed.
+     (cd mit-pthreads; sh ./configure)
+     echo "End of MIT Pthreads configuration"
+     echo ""
++    LIBS="$MT_LD_ADD $LIBS"
+   fi
+ fi
+ 
diff --git a/databases/mysql-client/pkg/PLIST b/databases/mysql-client/pkg/PLIST
index 2a97dc18c9e..316f50d1740 100644
--- a/databases/mysql-client/pkg/PLIST
+++ b/databases/mysql-client/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2001/05/02 08:22:30 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/07/08 13:59:15 bad Exp $
 bin/msql2mysql
 bin/mysql
+bin/mysqlcheck
 bin/mysql_config
 bin/mysql_convert_table_format
 bin/mysql_find_rows
@@ -62,7 +63,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.35.spec
+share/mysql/mysql-3.23.39.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 @dirrm share/mysql
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index 37bea7909ef..424d238ee03 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2001/05/02 08:22:30 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/07/08 13:59:16 bad Exp $
 #
 
 .include "../../databases/mysql-client/Makefile.common"
 
-PKGNAME=		${DISTNAME:S/-/-server-/}nb1
+PKGNAME=		${DISTNAME:S/-/-server-/}
 COMMENT=		MySQL, a free SQL database (server)
 
 DEPENDS+=		${DISTNAME:S/-/-client-/}:../../databases/mysql-client
diff --git a/databases/mysql-server/distinfo b/databases/mysql-server/distinfo
index 92303a955a4..57fd789c5f6 100644
--- a/databases/mysql-server/distinfo
+++ b/databases/mysql-server/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.4 2001/07/06 15:27:17 bad Exp $
+$NetBSD: distinfo,v 1.5 2001/07/08 13:59:16 bad Exp $
 
-SHA1 (mysql-3.23.35.tar.gz) = c1532aa954d613d0a4ebdae046ae23427e4ee327
-Size (mysql-3.23.35.tar.gz) = 10929885 bytes
+SHA1 (mysql-3.23.39.tar.gz) = bca088128d17f2274cff16bc0c4aaf383d5c27f1
+Size (mysql-3.23.39.tar.gz) = 11211077 bytes
 SHA1 (patch-aa) = 05c56d81e17893dd267fcd5f68d8c378f024a06f
 SHA1 (patch-ab) = 4f10917780d73cb4a58127b27a5d8c1c9f63e0d3
 SHA1 (patch-ac) = 9ac4beb4f53cc4d4fc4ec52cf30716c8269face8
 SHA1 (patch-ad) = 1aecfee152d303b3d65f3866032d2a6d49538f46
-SHA1 (patch-ae) = ae05bb8c369b57b110e2be9c9d85feb23cb0b918
-SHA1 (patch-af) = dd4b7694d0d282acbefb5a0039cf66e4dc40d3a6
+SHA1 (patch-ae) = 91e0c47e1e722cf84463af2c298a17beac56e2e9
+SHA1 (patch-af) = e21b8898e24a1d576f8301b0bf9363f648d81b61
+SHA1 (patch-ag) = 6d908d292cb71459820817153dde87de7242a7f7
diff --git a/databases/mysql-server/patches/patch-ae b/databases/mysql-server/patches/patch-ae
index a1a778f976c..5c2797838cc 100644
--- a/databases/mysql-server/patches/patch-ae
+++ b/databases/mysql-server/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2001/07/06 15:27:18 bad Exp $
+$NetBSD: patch-ae,v 1.6 2001/07/08 13:59:16 bad Exp $
 
---- configure.in.orig	Fri Mar 16 01:51:51 2001
-+++ configure.in	Fri Jul  6 16:37:36 2001
-@@ -581,7 +581,10 @@
+--- configure.in.orig	Tue Jun 12 21:07:23 2001
++++ configure.in	Sat Jul  7 23:37:11 2001
+@@ -629,7 +629,10 @@
          AC_MSG_RESULT(yes)
          AC_DEFINE(LIBWRAP)
          AC_DEFINE(HAVE_LIBWRAP)
@@ -14,7 +14,15 @@ $NetBSD: patch-ae,v 1.5 2001/07/06 15:27:18 bad Exp $
          AC_MSG_RESULT(no)
          CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
        CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
-@@ -1589,7 +1592,11 @@
+@@ -1653,7 +1656,6 @@
+ else
+   bench_dirs=""
+ fi
+-bench_dirs="$bench_dirs mysql-test"
+ AC_SUBST(bench_dirs)
+ 
+ # Don't build readline, i have it already
+@@ -1670,7 +1672,11 @@
    # This requires readline to be in a standard place. Mosty for linux
    # there readline may be a shared library.
    readline_dir=""
@@ -27,7 +35,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/06 15:27:18 bad Exp $
  fi
  AC_SUBST(readline_dir)
  AC_SUBST(readline_link)
-@@ -1951,15 +1958,15 @@
+@@ -2043,15 +2049,15 @@
      AC_DEFINE(HAVE_mit_thread)
      MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
      AC_SUBST(MT_INCLUDES)
diff --git a/databases/mysql-server/patches/patch-af b/databases/mysql-server/patches/patch-af
index fa146ba6af8..b67a808ee4e 100644
--- a/databases/mysql-server/patches/patch-af
+++ b/databases/mysql-server/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2001/07/06 15:27:18 bad Exp $
+$NetBSD: patch-af,v 1.6 2001/07/08 13:59:16 bad Exp $
 
---- configure.orig	Fri Mar 16 01:52:05 2001
-+++ configure	Fri Jul  6 16:37:36 2001
-@@ -5004,7 +5004,10 @@
+--- configure.orig	Tue Jun 12 21:07:37 2001
++++ configure	Sat Jul  7 23:37:20 2001
+@@ -5065,7 +5065,10 @@
  #define HAVE_LIBWRAP 1
  EOF
  
@@ -14,7 +14,15 @@ $NetBSD: patch-af,v 1.5 2001/07/06 15:27:18 bad Exp $
  else
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
-@@ -9345,7 +9348,11 @@
+@@ -9554,7 +9557,6 @@
+ else
+   bench_dirs=""
+ fi
+-bench_dirs="$bench_dirs mysql-test"
+ 
+ 
+ # Don't build readline, i have it already
+@@ -9575,7 +9577,11 @@
    # This requires readline to be in a standard place. Mosty for linux
    # there readline may be a shared library.
    readline_dir=""
@@ -27,7 +35,7 @@ $NetBSD: patch-af,v 1.5 2001/07/06 15:27:18 bad Exp $
  fi
  
  
-@@ -10466,15 +10473,15 @@
+@@ -10745,15 +10751,15 @@
  
      MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
      
diff --git a/databases/mysql-server/patches/patch-ag b/databases/mysql-server/patches/patch-ag
new file mode 100644
index 00000000000..2461f6c65f7
--- /dev/null
+++ b/databases/mysql-server/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2001/07/08 13:59:16 bad Exp $
+
+--- sql/Makefile.in.orig	Tue Jun 12 21:16:58 2001
++++ sql/Makefile.in	Sat Jul  7 23:59:32 2001
+@@ -198,7 +198,7 @@
+ gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
+ mysqlbinlog_SOURCES = mysqlbinlog.cc mini_client.cc net_serv.cc 			mini_client_errors.c violite.c password.c
+ 
+-mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) $(mysqld_LDADD)
++mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS 
+ 
+ DEFS = -DMYSQL_SERVER 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" 			-DDATADIR="\"$(MYSQLDATAdir)\"" 			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" 			@DEFS@
+