Skip to content

M
mariadb
Commit 00270a70 authored by Jonathan Perkin's avatar Jonathan Perkin
Browse files
Options

Merge from mysql-5.1.34-release

parents 22f24034 79650ae6
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
include/config-win.h
View file @ 00270a70
...@@ -63,9 +63,6 @@ functions */ ...@@ -63,9 +63,6 @@ functions */
#endif #endif
#ifndef __WIN32__ #ifndef __WIN32__
#define __WIN32__ #define __WIN32__
#define _INTEGRAL_MAX_BITS 32
#else
#define _INTEGRAL_MAX_BITS 64
#endif #endif
#endif /* _WIN64 */ #endif /* _WIN64 */
#ifndef __WIN__ #ifndef __WIN__
......
mysys/safemalloc.c
View file @ 00270a70
...@@ -174,7 +174,7 @@ void *_mymalloc(size_t size, const char *filename, uint lineno, myf MyFlags) ...@@ -174,7 +174,7 @@ void *_mymalloc(size_t size, const char *filename, uint lineno, myf MyFlags)
data[size + 3]= MAGICEND3; data[size + 3]= MAGICEND3;
irem->filename= (char *) filename; irem->filename= (char *) filename;
irem->linenum= lineno; irem->linenum= lineno;
irem->datasize= (uint32) size; irem->datasize= size;
irem->prev= NULL; irem->prev= NULL;
/* Add this remember structure to the linked list */ /* Add this remember structure to the linked list */
......
storage/ibmdb2i/Makefile.am
View file @ 00270a70
...@@ -27,6 +27,7 @@ DEFS = @DEFS@ ...@@ -27,6 +27,7 @@ DEFS = @DEFS@
noinst_HEADERS = ha_ibmdb2i.h db2i_collationSupport.h db2i_file.h \ noinst_HEADERS = ha_ibmdb2i.h db2i_collationSupport.h db2i_file.h \
db2i_ioBuffers.h db2i_blobCollection.h \ db2i_ioBuffers.h db2i_blobCollection.h \
db2i_global.h db2i_misc.h db2i_charsetSupport.h db2i_errors.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 db2i_ileBridge.h db2i_validatedPointer.h
EXTRA_LTLIBRARIES = ha_ibmdb2i.la EXTRA_LTLIBRARIES = ha_ibmdb2i.la
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7