diff options
author | unknown <joreland@mysql.com> | 2004-12-28 22:20:37 +0100 |
---|---|---|
committer | unknown <joreland@mysql.com> | 2004-12-28 22:20:37 +0100 |
commit | 150924ab54b89c97186b8f6f80307573de3149df (patch) | |
tree | 5aad3633062224def854abaedf87d6a7efab04cb /ndb/include/ndbapi/NdbOperation.hpp | |
parent | f238eef38a39f1c4d3eb8b99dc9d15723efe657e (diff) | |
download | mariadb-git-150924ab54b89c97186b8f6f80307573de3149df.tar.gz |
wl1804 - ndb - add support for _all_ type in NdbScanFilter + TUP
ndb/include/ndbapi/NdbOperation.hpp:
change char* -> void*
ndb/include/ndbapi/NdbScanFilter.hpp:
Add generic cmp-function
Let "old" function use the new one
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Add support for all types for scan filters
ndb/src/ndbapi/NdbOperationInt.cpp:
Check length of argument
ndb/src/ndbapi/NdbScanFilter.cpp:
Add support for all types for scan filters
Diffstat (limited to 'ndb/include/ndbapi/NdbOperation.hpp')
-rw-r--r-- | ndb/include/ndbapi/NdbOperation.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ndb/include/ndbapi/NdbOperation.hpp b/ndb/include/ndbapi/NdbOperation.hpp index c9a961c519d..4d7db773505 100644 --- a/ndb/include/ndbapi/NdbOperation.hpp +++ b/ndb/include/ndbapi/NdbOperation.hpp @@ -577,21 +577,21 @@ public: * @param Label label to jump to * @return -1 if unsuccessful */ - int branch_col_eq(Uint32 ColId, const char * val, Uint32 len, + int branch_col_eq(Uint32 ColId, const void * val, Uint32 len, bool nopad, Uint32 Label); - int branch_col_ne(Uint32 ColId, const char * val, Uint32 len, + int branch_col_ne(Uint32 ColId, const void * val, Uint32 len, bool nopad, Uint32 Label); - int branch_col_lt(Uint32 ColId, const char * val, Uint32 len, + int branch_col_lt(Uint32 ColId, const void * val, Uint32 len, bool nopad, Uint32 Label); - int branch_col_le(Uint32 ColId, const char * val, Uint32 len, + int branch_col_le(Uint32 ColId, const void * val, Uint32 len, bool nopad, Uint32 Label); - int branch_col_gt(Uint32 ColId, const char * val, Uint32 len, + int branch_col_gt(Uint32 ColId, const void * val, Uint32 len, bool nopad, Uint32 Label); - int branch_col_ge(Uint32 ColId, const char * val, Uint32 len, + int branch_col_ge(Uint32 ColId, const void * val, Uint32 len, bool nopad, Uint32 Label); - int branch_col_like(Uint32 ColId, const char *, Uint32 len, + int branch_col_like(Uint32 ColId, const void *, Uint32 len, bool nopad, Uint32 Label); - int branch_col_notlike(Uint32 ColId, const char *, Uint32 len, + int branch_col_notlike(Uint32 ColId, const void *, Uint32 len, bool nopad, Uint32 Label); /** @@ -822,7 +822,7 @@ protected: int read_attr(const NdbColumnImpl* anAttrObject, Uint32 RegDest); int write_attr(const NdbColumnImpl* anAttrObject, Uint32 RegSource); int branch_reg_reg(Uint32 type, Uint32, Uint32, Uint32); - int branch_col(Uint32 type, Uint32, const char *, Uint32, bool, Uint32 Label); + int branch_col(Uint32 type, Uint32, const void *, Uint32, bool, Uint32 Label); int branch_col_null(Uint32 type, Uint32 col, Uint32 Label); // Handle ATTRINFO signals |