diff options
| author | pekka@mysql.com <> | 2006-05-05 00:53:34 +0200 |
|---|---|---|
| committer | pekka@mysql.com <> | 2006-05-05 00:53:34 +0200 |
| commit | 5ce418b260461908b84e5e0f34ddc106ef3be99e (patch) | |
| tree | 3f9b4caabdfe06640667b373f46612e69a649074 /ndb/include | |
| parent | 61632812e237d996b8124b6448acdc5d3e6fcd31 (diff) | |
| download | mariadb-git-5ce418b260461908b84e5e0f34ddc106ef3be99e.tar.gz | |
ndb - bug#17421, changes NDB API pushdown LIKE arg to plain char
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/ndbapi/NdbOperation.hpp | 4 | ||||
| -rw-r--r-- | ndb/include/util/NdbSqlUtil.hpp | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ndb/include/ndbapi/NdbOperation.hpp b/ndb/include/ndbapi/NdbOperation.hpp index 6237740c3c6..4db541f7fe4 100644 --- a/ndb/include/ndbapi/NdbOperation.hpp +++ b/ndb/include/ndbapi/NdbOperation.hpp @@ -631,6 +631,10 @@ public: bool nopad, Uint32 Label); int branch_col_ge(Uint32 ColId, const void * val, Uint32 len, bool nopad, Uint32 Label); + /** + * The argument is always plain char, even if the field is varchar + * (changed in 5.0.22). + */ int branch_col_like(Uint32 ColId, const void *, Uint32 len, bool nopad, Uint32 Label); int branch_col_notlike(Uint32 ColId, const void *, Uint32 len, diff --git a/ndb/include/util/NdbSqlUtil.hpp b/ndb/include/util/NdbSqlUtil.hpp index 36a75136c45..ff2d9766f81 100644 --- a/ndb/include/util/NdbSqlUtil.hpp +++ b/ndb/include/util/NdbSqlUtil.hpp @@ -45,14 +45,11 @@ public: typedef int Cmp(const void* info, const void* p1, unsigned n1, const void* p2, unsigned n2, bool full); /** - * Prototype for "like" comparison. Defined for string types. Second - * argument must have same type-specific format. Returns 0 on match, - * +1 on no match, and -1 on bad data. + * Prototype for "like" comparison. Defined for string types. First + * argument can be fixed or var* type, second argument is fixed. + * Returns 0 on match, +1 on no match, and -1 on bad data. * * Uses default special chars ( \ % _ ). - * - * TODO convert special chars to the cs so that ucs2 etc works - * TODO allow user-defined escape ( \ ) */ typedef int Like(const void* info, const void* p1, unsigned n1, const void* p2, unsigned n2); |