diff options
author | Igor Babaev <igor@askmonty.org> | 2013-10-13 18:10:19 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2013-10-13 18:10:19 -0700 |
commit | ddc46740a56bf3885ae33dc21e281c063d189abf (patch) | |
tree | 95de2e32ed970c1370e9c3fa15290b88d13955da /sql/item_func.cc | |
parent | d61cffa6b1dd8b25dbae2536af1b0b59091b9f06 (diff) | |
parent | c7db46a2427e933a379d0a8c62221c344a29ea06 (diff) | |
download | mariadb-git-ddc46740a56bf3885ae33dc21e281c063d189abf.tar.gz |
Merge 5.5->10.0-base
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r-- | sql/item_func.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index f93feb0fa91..ef436ef8dc9 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -761,6 +761,16 @@ double Item_int_func::val_real() return unsigned_flag ? (double) ((ulonglong) val_int()) : (double) val_int(); } +bool Item_int_func::count_sargable_conds(uchar *arg) +{ + if (sargable) + { + SELECT_LEX *sel= (SELECT_LEX *) arg; + sel->cond_count++; + } + return 0; +} + String *Item_int_func::val_str(String *str) { |