summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorTimothy Smith <timothy.smith@sun.com>2009-02-07 16:50:31 +0100
committerTimothy Smith <timothy.smith@sun.com>2009-02-07 16:50:31 +0100
commit3ba87c370005437656bbcafb0b9ee75527342752 (patch)
treefe32eeab98707f29a552790b3a6b5d159a351338 /sql/item_timefunc.h
parentaf193ed97e10778c7e62a0b71a0534fc29de12f4 (diff)
parent6c6fc0978e0123d515bf95059028ebdb9afd75f8 (diff)
downloadmariadb-git-3ba87c370005437656bbcafb0b9ee75527342752.tar.gz
Auto-merge up from 5.0
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 94b02d1eaf6..9e3c2e8c89f 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -419,6 +419,7 @@ public:
{
return save_time_in_field(field);
}
+ longlong val_int() { return val_int_from_decimal(); }
bool result_as_longlong() { return TRUE; }
};