summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2011-06-13 11:57:47 +0200
committerMattias Jonsson <mattias.jonsson@oracle.com>2011-06-13 11:57:47 +0200
commit775770145c904f48949c5c0e95d594d8f222eb32 (patch)
treee9f7dcaea07cffd1d7bace5e923414f1430c3d19 /sql/item_timefunc.h
parente827b51fa0a8e7aefd7d38f19725452b15803dfe (diff)
parentd53906e3872016cb06f48a80557fb8edda59b691 (diff)
downloadmariadb-git-775770145c904f48949c5c0e95d594d8f222eb32.tar.gz
merge
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index ca1624c9082..e01b86191b8 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -391,6 +391,8 @@ public:
Item_func_unix_timestamp(Item *a) :Item_int_func(a) {}
longlong val_int();
const char *func_name() const { return "unix_timestamp"; }
+ enum_monotonicity_info get_monotonicity_info() const;
+ longlong val_int_endpoint(bool left_endp, bool *incl_endp);
bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
/*
UNIX_TIMESTAMP() depends on the current timezone