bk commit into 5.0 tree (stewart:1.1982)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1982 05/08/16 18:59:10 stewart@stripped +1 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11538
  into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.137 05/08/16 18:58:59 stewart@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.123.13.3 05/08/16 18:58:59 stewart@stripped +0 -0
    Merge rename: acinclude.m4 -> BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	kennedy.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/main/RESYNC

--- 1.123.13.2/acinclude.m4	2005-08-16 18:32:45 +10:00
+++ 1.137/BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003	2005-08-16 18:58:59 +10:00
@@ -1175,23 +1175,6 @@
 AC_SUBST(orbit_idl)
 ])
 
-AC_DEFUN([MYSQL_CHECK_ISAM], [
-  AC_ARG_WITH([isam], [
-  --with-isam             Enable the ISAM table type],
-    [with_isam="$withval"],
-    [with_isam=no])
-
-  isam_libs=
-  if test X"$with_isam" = X"yes"
-  then
-    AC_DEFINE([HAVE_ISAM], [1], [Using old ISAM tables])
-    isam_libs="\$(top_builddir)/isam/libnisam.a\
- \$(top_builddir)/merge/libmerge.a"
-  fi
-  AC_SUBST(isam_libs)
-])
-
-
 dnl ---------------------------------------------------------------------------
 dnl Macro: MYSQL_CHECK_BDB
 dnl Sets HAVE_BERKELEY_DB if inst library is found