bk commit into 5.1 tree (iggy:1.2326)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of Administrator. When Administrator 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@stripped, 2006-10-26 15:41:47-04:00, iggy@amd64. +1 -0
  Post Merge Cleanup

  storage/innobase/include/univ.i@stripped, 2006-10-26 15:38:50-04:00, iggy@amd64. +9 -0
    Post Merge Cleanup

# 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:	iggy
# Host:	amd64.
# Root:	D:/src/mysql-5.1-maint_patchtest

--- 1.58/storage/innobase/include/univ.i	2006-10-26 15:41:58 -04:00
+++ 1.59/storage/innobase/include/univ.i	2006-10-26 15:41:58 -04:00
@@ -40,11 +40,20 @@
 # undef VERSION
 
 /* Include the header file generated by GNU autoconf */
+#ifndef __WIN__
 # include "config.h"
+#endif
 
 # ifdef HAVE_SCHED_H
 #  include <sched.h>
 # endif
+
+/* When compiling for Itanium IA64, undefine the flag below to prevent use
+of the 32-bit x86 assembler in mutex operations. */
+
+#if defined(__WIN__) && !defined(WIN64) && !defined(_WIN64)
+#define UNIV_CAN_USE_X86_ASSEMBLER
+#endif
 
 /* We only try to do explicit inlining of functions with gcc and
 Microsoft Visual C++ */