diff options
author | unknown <wax@mysql.com> | 2004-06-08 12:44:02 +0600 |
---|---|---|
committer | unknown <wax@mysql.com> | 2004-06-08 12:44:02 +0600 |
commit | 8ac2f605acad62d912e5efa2817754ac264642e6 (patch) | |
tree | dcd6f0ef170e527b43d92361587534dd4eff4c49 /ndb/include/ndbapi/NdbOperation.hpp | |
parent | 9ff3f0feaace8286cdf78ef206cf3721bc7c2bc9 (diff) | |
parent | 8a2b50c4a1744c23e44436020cbc3bbf286311bd (diff) | |
download | mariadb-git-8ac2f605acad62d912e5efa2817754ac264642e6.tar.gz |
Merge mysql.com:/home/wax/mysql/mysql-5.0
into mysql.com:/home/wax/mysql/mysql-5.0service
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'ndb/include/ndbapi/NdbOperation.hpp')
-rw-r--r-- | ndb/include/ndbapi/NdbOperation.hpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ndb/include/ndbapi/NdbOperation.hpp b/ndb/include/ndbapi/NdbOperation.hpp index 4f5f4597937..3c515fe84ef 100644 --- a/ndb/include/ndbapi/NdbOperation.hpp +++ b/ndb/include/ndbapi/NdbOperation.hpp @@ -17,14 +17,11 @@ #ifndef NdbOperation_H #define NdbOperation_H -#include <stdlib.h> -#include <assert.h> - #include <ndb_types.h> -#include "AttrType.hpp" -#include "NdbError.hpp" -#include "NdbReceiver.hpp" -#include <stdlib.h> + +#include <AttrType.hpp> +#include <NdbError.hpp> +#include <NdbReceiver.hpp> class Ndb; class NdbApiSignal; @@ -480,8 +477,8 @@ public: * the attribute, or a NULL pointer * (indicating error). */ - NdbRecAttr* getValue(const char* anAttrName, char* aValue = NULL); - NdbRecAttr* getValue(Uint32 anAttrId, char* aValue = NULL); + NdbRecAttr* getValue(const char* anAttrName, char* aValue = 0); + NdbRecAttr* getValue(Uint32 anAttrId, char* aValue = 0); /** * Define an attribute to set or update in query. @@ -925,7 +922,7 @@ protected: virtual int equal_impl(const NdbColumnImpl* anAttrObject, const char* aValue, Uint32 len); - NdbRecAttr* getValue(const NdbColumnImpl* anAttrObject, char* aValue = NULL); + NdbRecAttr* getValue(const NdbColumnImpl* anAttrObject, char* aValue = 0); int setValue(const NdbColumnImpl* anAttrObject, const char* aValue, Uint32 len); int incValue(const NdbColumnImpl* anAttrObject, Uint32 aValue); int incValue(const NdbColumnImpl* anAttrObject, Uint64 aValue); |