diff options
author | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
commit | 04a4b4334650b2183d25a7b04c1e83c31bffb22d (patch) | |
tree | 587654c186615669df8d81b851db711bb8ac2f62 /sql/item_func.h | |
parent | 37a78d6868d0e25d286299c91d5787fb6733844d (diff) | |
parent | 60c15066db4f59e0362420d46a1ca5b6fbb30e56 (diff) | |
download | mariadb-git-04a4b4334650b2183d25a7b04c1e83c31bffb22d.tar.gz |
merge with 5.1
Diffstat (limited to 'sql/item_func.h')
-rw-r--r-- | sql/item_func.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 8ad952ee85f..9d64bcad490 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1405,6 +1405,7 @@ public: my_decimal *val_decimal(my_decimal *); double val_result(); longlong val_int_result(); + bool val_bool_result(); String *str_result(String *str); my_decimal *val_decimal_result(my_decimal *); bool is_null_result(); |