diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-10 07:07:56 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-10 07:07:56 +0100 |
| commit | 111de516ab972f076f5b6ec2399874391bfeb473 (patch) | |
| tree | 51f2d1b0305bb5e58ebf2fe09ba255c8efdd44e2 /sql/ha_ndbcluster_cond.h | |
| parent | 4a8c442f040db67763697df8f109f79ec6240979 (diff) | |
| parent | a0eec8abbb233d9e3f278d343eaed2e70b55161e (diff) | |
| download | mariadb-git-111de516ab972f076f5b6ec2399874391bfeb473.tar.gz | |
Merge mysql.com:/misc/mysql/34749/50-34749
into mysql.com:/misc/mysql/34749/51-34749
mysql-test/r/func_misc.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/ha_ndbcluster_cond.cc:
Auto merged
sql/ha_ndbcluster_cond.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster_cond.h')
| -rw-r--r-- | sql/ha_ndbcluster_cond.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster_cond.h b/sql/ha_ndbcluster_cond.h index 4d1d2ef9f92..4401a93c9e1 100644 --- a/sql/ha_ndbcluster_cond.h +++ b/sql/ha_ndbcluster_cond.h @@ -233,6 +233,7 @@ public: case (Item_func::ISNOTNULL_FUNC): { return NDB_ISNOTNULL_FUNC; } case (Item_func::LIKE_FUNC): { return NDB_LIKE_FUNC; } case (Item_func::NOT_FUNC): { return NDB_NOT_FUNC; } + case (Item_func::NEG_FUNC): { return NDB_UNKNOWN_FUNC; } case (Item_func::UNKNOWN_FUNC): { return NDB_UNKNOWN_FUNC; } case (Item_func::COND_AND_FUNC): { return NDB_COND_AND_FUNC; } case (Item_func::COND_OR_FUNC): { return NDB_COND_OR_FUNC; } |