diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-04-29 00:38:10 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-29 00:38:10 +0200 |
commit | c4499a03917aecfc2d86142c469d02618cbec54b (patch) | |
tree | 9cd51b7c8d2274300165840204ae3eb19401942f /sql/item_func.cc | |
parent | d6dbe8e2071bf9fdc21b5530abce88ff01b40e25 (diff) | |
parent | 5cfe52314e29386e1867fad1b44eace2b9d0be7e (diff) | |
download | mariadb-git-c4499a03917aecfc2d86142c469d02618cbec54b.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r-- | sql/item_func.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 002eef67667..dac45cc0928 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -220,6 +220,7 @@ Item_func::fix_fields(THD *thd, Item **ref) maybe_null=1; with_sum_func= with_sum_func || item->with_sum_func; + with_param= with_param || item->with_param; with_field= with_field || item->with_field; used_tables_cache|= item->used_tables(); const_item_cache&= item->const_item(); |