bk commit into 5.0 tree (acurtis:1.2210)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony 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.2210 06/06/28 09:54:40 acurtis@stripped +2 -0
  Merge xiphis.org:/home/antony/work2/p4-bug12096.2
  into  xiphis.org:/home/antony/work2/p4-bug12096.2-merge

  sql/mysqld.cc
    1.559 06/06/28 09:54:35 acurtis@stripped +0 -0
    Auto merged

  configure.in
    1.396 06/06/28 09:54:35 acurtis@stripped +0 -0
    Auto merged

# 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:	acurtis
# Host:	ltamd64.xiphis.org
# Root:	/home/antony/work2/p4-bug12096.2-merge/RESYNC

--- 1.395/configure.in	2006-06-18 14:16:16 -07:00
+++ 1.396/configure.in	2006-06-28 09:54:35 -07:00
@@ -515,6 +515,10 @@ AM_PROG_CC_STDC
 
 # We need an assembler, too
 AM_PROG_AS
+CCASFLAGS="$CCASFLAGS $ASFLAGS"
+
+# Check if we need noexec stack for assembler
+AC_CHECK_NOEXECSTACK
 
 if test "$am_cv_prog_cc_stdc" = "no"
 then