mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from mysql-5.1.34-release

Browse source
This commit is contained in:
Jonathan Perkin 2009-04-16 20:43:24 +02:00
commit 086185089e
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/config-win.h
View file

@ -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__

2
mysys/safemalloc.c
View file

@ -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 */

1
storage/ibmdb2i/Makefile.am
View file

@ -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