diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-09-13 12:06:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-09-13 12:06:17 +0400 |
| commit | 51dcf4dcff44e64b9a18951898ed29f2c576ae61 (patch) | |
| tree | 95ff77f90a05056c22e291a1d7ea33965f553dc8 /sql/item_func.h | |
| parent | 33f807fd91826013499c996f9515838cf2c6d0c5 (diff) | |
| parent | 499ddea5766d988adc858448c8eec549c7bedcc1 (diff) | |
| download | mariadb-git-51dcf4dcff44e64b9a18951898ed29f2c576ae61.tar.gz | |
Merge from 5.3.
pending merges:
Alexander Barkov 2013-09-12 MDEV-4724 Some temporal functions do not pre...
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index fe08473060c..eca6249d1dd 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1809,6 +1809,8 @@ public: double val_real(); longlong val_int(); String* val_str(String*); + my_decimal *val_decimal(my_decimal *dec_buf) + { return val_decimal_from_real(dec_buf); } /* TODO: fix to support views */ const char *func_name() const { return "get_system_var"; } /** |