Update mysql4-{client,server} to 4.1.9.

Functionality added or changed:

    * The Mac OS X 10.3 installation disk images now include a MySQL
Preference Pane for the Mac OS X Control Panel that enables the user
to start and stop the MySQL server via the GUI and activate and
deactivate the automatic MySQL server startup on bootup.
    * Seconds_Behind_Master will be NULL (which means ``unknown'')
if the slave SQL thread is not running, or if the slave I/O thread
is not running or not connected to master. It will be zero if the
SQL thread has caught up with the I/O thread. It no longer grows
indefinitely if the master is idle.
    * InnoDB: Do not acquire an internal InnoDB table lock in LOCK
TABLES if AUTOCOMMIT=1. This helps in porting old MyISAM applications
to InnoDB. InnoDB table locks in that case caused deadlocks very easily.
    * InnoDB: Print a more descriptive error and refuse to start InnoDB
if the size of `ibdata' files is smaller than what is stored in the
tablespace header; innodb_force_recovery overrides this.
    * The MySQL server aborts immediately instead of simply issuing a
warning if it is started with the --log-bin option but cannot
initialize the binary log at startup (that is, an error occurs when
writing to the binary log file or binary log index file).
    * The binary log file and binary log index file now behave like
MyISAM when there is a "disk full" or "quota exceeded" error. See
section A.4.3 How MySQL Handles a Full Disk.

Many bugfixes were fixed... see
http://dev.mysql.com/doc/mysql/en/News-4.1.9.html

9 files changed, 42 insertions, 83 deletions

diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 597fe7d6d1c..c3b85531cdd 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.28 2005/01/10 15:47:18 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.29 2005/01/17 14:42:35 xtraeme Exp $
 
-DISTNAME=		mysql-4.1.8a
+DISTNAME=		mysql-4.1.9
 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 8a12abd1359..e98f7e1cb81 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2005/01/11 22:44:34 xtraeme Exp $
+$NetBSD: distinfo,v 1.13 2005/01/17 14:42:35 xtraeme Exp $
 
-SHA1 (mysql-4.1.8a.tar.gz) = 845555eb6d1f48806e24e66a7a28ae822729cdcf
-Size (mysql-4.1.8a.tar.gz) = 22945198 bytes
-SHA1 (patch-af) = 66ac801ebd289d36a36434c6626cfea09a022713
+SHA1 (mysql-4.1.9.tar.gz) = e526f301704f8fca7c7e9f42d368ffa1fef2a152
+Size (mysql-4.1.9.tar.gz) = 22308321 bytes
+SHA1 (patch-af) = 40c6d8a8a51bad8f0132bf63dbf865e4a5362504
 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
-SHA1 (patch-av) = e2563965cb074c4dbd3b225b98de579dbb1d2b9b
+SHA1 (patch-av) = 4f73104cd3b798103eb2c4f83073dbac02b4db90
 SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
 SHA1 (patch-ax) = 9e9176468d6d335617862a4d77a358931d7c8c49
 SHA1 (patch-ay) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af
index 2a45b52a844..a86f7c17def 100644
--- a/databases/mysql4-client/patches/patch-af
+++ b/databases/mysql4-client/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-af,v 1.6 2005/01/17 14:42:35 xtraeme Exp $
 
---- configure.orig	2004-12-27 17:48:08.000000000 +0100
-+++ configure	2005-01-10 15:44:21.000000000 +0100
-@@ -36429,34 +36429,10 @@
+--- configure.orig	2005-01-17 15:03:22.000000000 +0100
++++ configure	2005-01-17 15:05:30.000000000 +0100
+@@ -36436,30 +36436,10 @@
  fi;
  
  
@@ -23,25 +23,17 @@ $NetBSD: patch-af,v 1.5 2005/01/10 15:47:18 xtraeme Exp $
 -_ACEOF
 -
 -else
--  orbit_exec_prefix=
--  orbit_includes=
--  orbit_libs=
--  orbit_idl=
+   orbit_exec_prefix=
+   orbit_includes=
+   orbit_libs=
+   orbit_idl=
 -  echo "$as_me:$LINENO: result: not found" >&5
 -echo "${ECHO_T}not found" >&6
 -fi
--
--
--
--
-+orbit_exec_prefix=
-+orbit_includes=
-+orbit_libs=
-+orbit_idl=
  
-   echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5
- echo $ECHO_N "checking if we should build MySQLFS... $ECHO_C" >&6
-@@ -36731,7 +36707,7 @@
+ 
+ 
+@@ -36738,7 +36718,7 @@
  else
    bench_dirs=""
  fi
@@ -50,12 +42,3 @@ $NetBSD: patch-af,v 1.5 2005/01/10 15:47:18 xtraeme Exp $
  
  
  # Don't build readline, i have it already
-@@ -38915,7 +38891,7 @@
- server_scripts=
- thread_dirs=
- 
--sql_client_dirs="libmysql client"
-+sql_client_dirs="libmysql regex client"
- linked_client_targets="linked_libmysql_sources"
- CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS
- if test "$THREAD_SAFE_CLIENT" != "no"
diff --git a/databases/mysql4-client/patches/patch-av b/databases/mysql4-client/patches/patch-av
index 4919ef78a03..d6c730e40fd 100644
--- a/databases/mysql4-client/patches/patch-av
+++ b/databases/mysql4-client/patches/patch-av
@@ -1,15 +1,15 @@
-$NetBSD: patch-av,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-av,v 1.3 2005/01/17 14:42:35 xtraeme Exp $
 
---- Makefile.in.orig	2005-01-10 13:38:58.000000000 +0100
-+++ Makefile.in	2005-01-10 13:40:52.000000000 +0100
-@@ -338,12 +338,7 @@
+--- Makefile.in.orig	2005-01-17 15:05:45.000000000 +0100
++++ Makefile.in	2005-01-17 15:06:09.000000000 +0100
+@@ -339,12 +339,7 @@
  
  # These are built from source in the Docs directory
  EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack \
--			@sql_server_dirs@ @sql_client_dirs@ scripts man tests \
+-			@sql_union_dirs@ scripts man tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS = . include strings @sql_client_dirs@ scripts man
diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST
index c8fcbce5d9a..2727a1d0553 100644
--- a/databases/mysql4-server/PLIST
+++ b/databases/mysql4-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/01/10 15:47:18 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/01/17 14:42:35 xtraeme Exp $
 bin/client_test
 bin/comp_err
 bin/isamchk
@@ -68,6 +68,11 @@ 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/analyse.result
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index 7cfa94f6d44..dff1ec71ff0 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.11 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: distinfo,v 1.12 2005/01/17 14:42:35 xtraeme Exp $
 
-SHA1 (mysql-4.1.8a.tar.gz) = 845555eb6d1f48806e24e66a7a28ae822729cdcf
-Size (mysql-4.1.8a.tar.gz) = 22945198 bytes
-SHA1 (patch-aa) = cb11b0461c88d3ded9be63f8fcf28c0759441a72
+SHA1 (mysql-4.1.9.tar.gz) = e526f301704f8fca7c7e9f42d368ffa1fef2a152
+Size (mysql-4.1.9.tar.gz) = 22308321 bytes
+SHA1 (patch-aa) = 1fd6136e4b8212cce4d68bb33c9dcddeca2e3d59
 SHA1 (patch-ab) = 8521d07034428de396ed56529b6c18af50739b9d
 SHA1 (patch-ac) = ba78b6168d79520cc6bee8e06e89ca3fe90d92a1
 SHA1 (patch-af) = 2accaca59821f0e82944690f41f905f6560bd76f
 SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
-SHA1 (patch-am) = 2279653e5ee3df2f19242e9d4212d3666188b1d2
+SHA1 (patch-am) = 8da1f42e0524512cdba953833420650922a27ccb
 SHA1 (patch-aq) = b971690206b416e75046cca3e53f6222b55725c5
 SHA1 (patch-ar) = bb3329100655d99484934e69d5c8a7e3dc459542
 SHA1 (patch-as) = 2cf503e557eb6a8534221f6e576f055b9f4b68ce
 SHA1 (patch-at) = b8a4ad4d4ff8cf04b300c147a68847d1476e607e
 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
-SHA1 (patch-av) = 6ea5b9338d223f1380386288c537f55d4fd7a7d7
 SHA1 (patch-aw) = 79b9afbcb16a868c193cded23a50e53987579f27
 SHA1 (patch-ax) = b2f76b2d4e6aca649f975eba0f9c18316d4d4c17
diff --git a/databases/mysql4-server/patches/patch-aa b/databases/mysql4-server/patches/patch-aa
index 6910bb9d064..d664846b629 100644
--- a/databases/mysql4-server/patches/patch-aa
+++ b/databases/mysql4-server/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2005/01/10 15:47:18 xtraeme Exp $
-
---- Makefile.in.orig	2005-01-10 16:09:00.000000000 +0100
-+++ Makefile.in	2005-01-10 16:09:25.000000000 +0100
-@@ -338,12 +338,8 @@
+--- Makefile.in.orig	2005-01-17 15:15:42.000000000 +0100
++++ Makefile.in	2005-01-17 15:16:11.000000000 +0100
+@@ -339,12 +339,8 @@
  
  # These are built from source in the Docs directory
  EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack \
--			@sql_server_dirs@ @sql_client_dirs@ scripts man tests \
+-			@sql_union_dirs@ scripts man tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \
diff --git a/databases/mysql4-server/patches/patch-am b/databases/mysql4-server/patches/patch-am
index fc15848592f..87b8b1fbcdd 100644
--- a/databases/mysql4-server/patches/patch-am
+++ b/databases/mysql4-server/patches/patch-am
@@ -1,7 +1,5 @@
-$NetBSD: patch-am,v 1.5 2004/10/28 01:12:44 xtraeme Exp $
-
---- scripts/mysqld_safe.sh.orig	2004-10-27 23:23:41.000000000 +0200
-+++ scripts/mysqld_safe.sh	2004-10-27 23:27:02.000000000 +0200
+--- scripts/mysqld_safe.sh.orig	2005-01-17 15:16:35.000000000 +0100
++++ scripts/mysqld_safe.sh	2005-01-17 15:20:03.000000000 +0100
 @@ -253,6 +253,14 @@
    fi
  fi
@@ -23,7 +21,7 @@ $NetBSD: patch-am,v 1.5 2004/10/28 01:12:44 xtraeme Exp $
      then    # The pid contains a mysqld process
 -      echo "A mysqld process already exists"
 -      echo "A mysqld process already exists at " `date` >> $err_log
-+	datemsg "A mysqld process already exists"
++	    datemsg "A mysqld process already exists"
        exit 1
      fi
    fi
@@ -74,7 +72,7 @@ $NetBSD: patch-am,v 1.5 2004/10/28 01:12:44 xtraeme Exp $
  
 @@ -324,7 +330,7 @@
      # kill -9 is used or the process won't react on the kill.
-     numofproces=`ps xa | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"`
+     numofproces=`ps xaww | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"`
  
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 +    datemsg -e "\nNumber of processes running now: $numofproces"
diff --git a/databases/mysql4-server/patches/patch-av b/databases/mysql4-server/patches/patch-av
deleted file mode 100644
index 92e0ee6e32e..00000000000
--- a/databases/mysql4-server/patches/patch-av
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-av,v 1.1 2004/02/24 14:53:54 grant Exp $
-
---- sql/mysqld.cc.orig	2003-12-15 08:23:47.000000000 +1100
-+++ sql/mysqld.cc
-@@ -106,7 +106,18 @@ extern "C" {					// Because of SCO 3.2V4
- int allow_severity = LOG_INFO;
- int deny_severity = LOG_WARNING;
- 
--#ifdef __STDC__
-+#ifdef __FreeBSD__
-+#  include <osreldate.h>
-+#  if defined(__STDC__) && __FreeBSD_version < 500000
-+#    define my_fromhost(A)	   fromhost(A)
-+#    define my_hosts_access(A) hosts_access(A)
-+#    define my_eval_client(A)  eval_client(A)
-+#  else
-+#    define my_fromhost(A)	   fromhost()
-+#    define my_hosts_access(A) hosts_access()
-+#    define my_eval_client(A)  eval_client()
-+#  endif
-+#elif defined(__STDC__)
- #define my_fromhost(A)	   fromhost(A)
- #define my_hosts_access(A) hosts_access(A)
- #define my_eval_client(A)  eval_client(A)