diff options
| author | Jonathan Perkin <jperkin@sun.com> | 2009-04-16 20:43:24 +0200 |
|---|---|---|
| committer | Jonathan Perkin <jperkin@sun.com> | 2009-04-16 20:43:24 +0200 |
| commit | 086185089e6c7bef58dde49b02950689af9fee63 (patch) | |
| tree | e1e8ad068d931cef6d6afc8ebda56f2a2a3b8e58 | |
| parent | 9530e5c79e802aea3054fb02935e99263022d1b8 (diff) | |
| parent | 0e531e8bb9ed11401df600aa3744dc25932224ff (diff) | |
| download | mariadb-git-086185089e6c7bef58dde49b02950689af9fee63.tar.gz | |
Merge from mysql-5.1.34-release
| -rw-r--r-- | include/config-win.h | 3 | ||||
| -rw-r--r-- | mysys/safemalloc.c | 2 | ||||
| -rw-r--r-- | storage/ibmdb2i/Makefile.am | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/include/config-win.h b/include/config-win.h index 26b08a5e4fb..3a21551ebbb 100644 --- a/include/config-win.h +++ b/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__ diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 36d07b475e9..c484f1d4c54 100644 --- a/mysys/safemalloc.c +++ b/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 */ diff --git a/storage/ibmdb2i/Makefile.am b/storage/ibmdb2i/Makefile.am index 2436a764429..768ca15f4cf 100644 --- a/storage/ibmdb2i/Makefile.am +++ b/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 |