diff options
| author | unknown <serg@serg.mylan> | 2003-10-31 14:25:38 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-31 14:25:38 +0100 |
| commit | c926bdc814fd2af3a4e374fc7b3042d8ab868d03 (patch) | |
| tree | ed7b399fcc0dba48fd4adfd8712e62b641c9a341 /sql/item_func.h | |
| parent | b04629049af702ba4a4ce1b0dc2d4e5d2e698da1 (diff) | |
| parent | 4a3553ed5cb62ce2dc9e515297ffbeaecb666a80 (diff) | |
| download | mariadb-git-c926bdc814fd2af3a4e374fc7b3042d8ab868d03.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
mysql-test/r/mysqldump.result:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 9a6e2a71f64..29e40f603b4 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -46,7 +46,8 @@ public: SP_TOUCHES_FUNC,SP_CROSSES_FUNC,SP_WITHIN_FUNC, SP_CONTAINS_FUNC,SP_OVERLAPS_FUNC, SP_STARTPOINT,SP_ENDPOINT,SP_EXTERIORRING, - SP_POINTN,SP_GEOMETRYN,SP_INTERIORRINGN}; + SP_POINTN,SP_GEOMETRYN,SP_INTERIORRINGN, + NOT_FUNC, NOT_ALL_FUNC}; enum optimize_type { OPTIMIZE_NONE,OPTIMIZE_KEY,OPTIMIZE_OP, OPTIMIZE_NULL }; enum Type type() const { return FUNC_ITEM; } virtual enum Functype functype() const { return UNKNOWN_FUNC; } |