bk commit into 5.0 tree (jimw:1.1885)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1885 05/04/26 08:20:51 jimw@stripped +3 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-9063
  into mysql.com:/home/jimw/my/mysql-5.0-build

  sql/mysqld.cc
    1.457 05/04/26 08:20:50 jimw@stripped +0 -0
    Auto merged

  configure.in
    1.289 05/04/26 08:20:50 jimw@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.132 05/04/26 08:20:50 jimw@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.123.8.3 05/04/26 08:20:49 jimw@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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-build/RESYNC

--- 1.123.8.2/acinclude.m4	2005-04-26 08:19:44 -07:00
+++ 1.132/BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003	2005-04-26 08:20:50 -07: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

--- 1.288/configure.in	2005-04-25 04:28:02 -07:00
+++ 1.289/configure.in	2005-04-26 08:20:50 -07:00
@@ -1754,6 +1754,8 @@
 MYSQL_TYPE_ACCEPT
 
 #---END:
+# Figure out what type of struct rlimit to use with setrlimit
+MYSQL_TYPE_STRUCT_RLIMIT
 # Find where the stack goes
 MYSQL_STACK_DIRECTION
 # We want to skip alloca on irix unconditionally. It may work on some version..

--- 1.456/sql/mysqld.cc	2005-04-15 18:35:46 -07:00
+++ 1.457/sql/mysqld.cc	2005-04-26 08:20:50 -07:00
@@ -2022,7 +2022,7 @@
   if (test_flags & TEST_CORE_ON_SIGNAL)
   {
     /* Change limits so that we will get a core file */
-    struct rlimit rl;
+    STRUCT_RLIMIT rl;
     rl.rlim_cur = rl.rlim_max = RLIM_INFINITY;
     if (setrlimit(RLIMIT_CORE, &rl) && global_system_variables.log_warnings)
       sql_print_warning("setrlimit could not change the size of core files to 'infinity';  We may not be able to generate a core file on signals");