diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-10-13 13:43:29 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-10-13 13:43:29 -0700 |
| commit | c7db46a2427e933a379d0a8c62221c344a29ea06 (patch) | |
| tree | 9b18bd0d93bea6517341827cfd02540054633174 /sql/item_func.cc | |
| parent | e37639e9349b56296d452e69e970df939383d7e1 (diff) | |
| parent | 78b580b77965d63d4292a72a3ba12d0cc83b01a3 (diff) | |
| download | mariadb-git-c7db46a2427e933a379d0a8c62221c344a29ea06.tar.gz | |
Merge 5.3-5.5
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 e4ec9c62b29..85c3a66d68b 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) { |