diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-11-07 13:25:20 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-11-07 13:25:20 -0500 |
| commit | a49d3f018b9562e847578d06766ced772519a333 (patch) | |
| tree | 4d1fff7efb5c0a6a068b26db4aec58c3c745c9eb /sql/item_func.cc | |
| parent | 75902e8d07fa8ae565183909cc6e6fa0defc58c1 (diff) | |
| parent | ddeec5ab8dcee15ccedf693b508d7ee9e7e857a9 (diff) | |
| download | mariadb-git-a49d3f018b9562e847578d06766ced772519a333.tar.gz | |
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
sql/item_func.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index df3d04c106f..f9331093495 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -5583,8 +5583,13 @@ Item_func_sp::fix_fields(THD *thd, Item **ref) #endif /* ! NO_EMBEDDED_ACCESS_CHECKS */ } + if (!m_sp->m_chistics->detistic) - used_tables_cache |= RAND_TABLE_BIT; + { + used_tables_cache |= RAND_TABLE_BIT; + const_item_cache= FALSE; + } + DBUG_RETURN(res); } @@ -5592,6 +5597,10 @@ Item_func_sp::fix_fields(THD *thd, Item **ref) void Item_func_sp::update_used_tables() { Item_func::update_used_tables(); + if (!m_sp->m_chistics->detistic) - used_tables_cache |= RAND_TABLE_BIT; + { + used_tables_cache |= RAND_TABLE_BIT; + const_item_cache= FALSE; + } } |