diff options
| author | unknown <joreland@mysql.com> | 2004-06-17 14:03:21 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-06-17 14:03:21 +0200 |
| commit | df6a7758b2033355795b41d12c2d9047962b77be (patch) | |
| tree | 5ed9ac82373196551d35373e3aaf75419d60a4f5 /ndb/src/ndbapi/Ndb.cpp | |
| parent | c203ec5dfb04dd6d410880e062b20348259c857b (diff) | |
| parent | 3d2949e5b801557d7f222c202dbabac3545b92f8 (diff) | |
| download | mariadb-git-df6a7758b2033355795b41d12c2d9047962b77be.tar.gz | |
merge blob code
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Auto merged
ndb/include/ndbapi/NdbApi.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/src/ndbapi/Ndblist.cpp:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/ndbapi/Makefile_old:
Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/Ndb.cpp')
| -rw-r--r-- | ndb/src/ndbapi/Ndb.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp index 6dcafef8082..c02f2c2a928 100644 --- a/ndb/src/ndbapi/Ndb.cpp +++ b/ndb/src/ndbapi/Ndb.cpp @@ -38,6 +38,10 @@ Name: Ndb.cpp #include <NdbEnv.h> #include <BaseString.hpp> +#ifndef MIN +#define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif + /**************************************************************************** void connect(); |