summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-11-24 00:09:54 +0200
committerMichael Widenius <monty@askmonty.org>2010-11-24 00:09:54 +0200
commitb16c389248d03f0c3de549884f607f3f191827b4 (patch)
tree6068b9d90b4127b1c3608e29913fa82bf1a1f20e /sql/item_func.h
parent01b100b5dd3040daa18791abb88a9ffef06efe67 (diff)
parentb52020221e8b4e58d1bc6dd5a5a6f065a6a3a083 (diff)
downloadmariadb-git-b16c389248d03f0c3de549884f607f3f191827b4.tar.gz
Automerge with 5.1
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 2b466960af2..bdaa217d555 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1368,6 +1368,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();