diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-29 09:49:55 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-29 09:49:55 +0000 |
| commit | 255078c49d0e059a9c1d8d138cfdf8051265ad4a (patch) | |
| tree | 3c6a718a298eac1126116dcfbc5be41c7239b955 | |
| parent | ba52659ebca26334af434dce658a37fca8281809 (diff) | |
| parent | 01475687379058300a3d37eaca7aedd088fd2845 (diff) | |
| download | mariadb-git-255078c49d0e059a9c1d8d138cfdf8051265ad4a.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
configure.in:
Auto merged
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | ndb/include/ndbapi/ndbapi_limits.h | 4 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.h | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 979782fe511..7c6b9ff7b51 100644 --- a/configure.in +++ b/configure.in @@ -1144,7 +1144,8 @@ dnl Is this the right match for DEC OSF on alpha? # gethostbyname_r is deprecated and doesn't work ok on OSF1 CFLAGS="$CFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R" CXXFLAGS="$CXXFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R" - ndb_cxxflags_fix="$ndb_cxxflags_fix -I/usr/include.dtk" + # fix to handle include of <stdint.h> correctly on OSF1 with cxx compiler + CXXFLAGS="$CXXFLAGS -I/usr/include/cxx -I/usr/include/cxx_cname -I/usr/include.dtk" ;; *netware*) # No need for curses library so set it to null diff --git a/ndb/include/ndbapi/ndbapi_limits.h b/ndb/include/ndbapi/ndbapi_limits.h index 1cf2d9b342d..f812fa2d69d 100644 --- a/ndb/include/ndbapi/ndbapi_limits.h +++ b/ndb/include/ndbapi/ndbapi_limits.h @@ -26,8 +26,8 @@ #define NDB_MAX_TUPLE_SIZE_IN_WORDS 1023 #define NDB_MAX_KEYSIZE_IN_WORDS 1023 -#define NDB_MAX_KEY_SIZE NDB_MAX_KEYSIZE_IN_WORDS*sizeof(Uint32) -#define NDB_MAX_TUPLE_SIZE NDB_MAX_TUPLE_SIZE_IN_WORDS*sizeof(uint32) +#define NDB_MAX_KEY_SIZE (NDB_MAX_KEYSIZE_IN_WORDS*4) +#define NDB_MAX_TUPLE_SIZE (NDB_MAX_TUPLE_SIZE_IN_WORDS*4) #define NDB_MAX_ACTIVE_EVENTS 100 #endif diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 8224d1c4167..b33a0657d4f 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -26,7 +26,6 @@ #endif #include <ndbapi_limits.h> -#include <ndb_types.h> class Ndb; // Forward declaration class NdbOperation; // Forward declaration |