branches/5.1:

Merge a change from MySQL:

  ------------------------------------------------------------
  revno: 2988
  committer: Satya B <satya.bn@sun.com>
  branch nick: mysql-5.1-bugteam
  timestamp: Wed 2009-07-01 11:06:05 +0530
  message:
    Fix build failure after applying Innodb snapshot 5.1-ss5282
    
    After applying Innodb snapshot 5.1-ss5282, build was broken
    because of missing header file. 
    
    Adding the header file to Makefile.am after informing the 
    innodb developers.
  modified:
    storage/innobase/Makefile.am

Makefile.am

@@ -50,7 +50,8 @@ noinst_HEADERS=		include/btr0btr.h include/btr0btr.ic		\
 			include/eval0eval.h include/eval0eval.ic	\
 			include/eval0proc.h include/eval0proc.ic	\
 			include/fil0fil.h include/fsp0fsp.h		\
-			include/fsp0fsp.ic include/fut0fut.h		\
+			include/fsp0fsp.ic include/fsp0types.h		\
+			include/fut0fut.h				\
 			include/fut0fut.ic include/fut0lst.h		\
 			include/fut0lst.ic include/ha0ha.h		\
 			include/ha0ha.ic include/hash0hash.h		\