Merge from mysql-5.1.34-release

include/config-win.h

@@ -63,9 +63,6 @@ functions */
 #endif
 #ifndef __WIN32__
 #define __WIN32__
-#define _INTEGRAL_MAX_BITS 32
-#else
-#define _INTEGRAL_MAX_BITS 64
 #endif
 #endif /* _WIN64 */
 #ifndef __WIN__

mysys/safemalloc.c

@@ -174,7 +174,7 @@ void *_mymalloc(size_t size, const char *filename, uint lineno, myf MyFlags)
   data[size + 3]= MAGICEND3;
   irem->filename= (char *) filename;
   irem->linenum= lineno;
-  irem->datasize= (uint32) size;
+  irem->datasize= size;
   irem->prev=	  NULL;
 
   /* Add this remember structure to the linked list */

storage/ibmdb2i/Makefile.am

@@ -27,6 +27,7 @@ DEFS =                  @DEFS@
 noinst_HEADERS =	ha_ibmdb2i.h db2i_collationSupport.h db2i_file.h \
 			db2i_ioBuffers.h db2i_blobCollection.h \
 			db2i_global.h db2i_misc.h db2i_charsetSupport.h db2i_errors.h \
+			db2i_iconv.h db2i_myconv.h db2i_safeString.h db2i_sqlStatementStream.h \
 			db2i_ileBridge.h db2i_validatedPointer.h
 
 EXTRA_LTLIBRARIES =	ha_ibmdb2i.la