Merge 5.3->5.5

1 files changed, 13 insertions, 0 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 7053b8fec65..7f309c7a4d3 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -6525,6 +6525,19 @@ Item_func_sp::init_result_field(THD *thd)
 
 
 /**
+  @note
+  Deterministic stored procedures are considered inexpensive.
+  Consequently such procedures may be evaluated during optimization,
+  if they are constant (checked by the optimizer).
+*/
+
+bool Item_func_sp::is_expensive()
+{
+  return !(m_sp->m_chistics->detistic);
+}
+
+
+/**
   @brief Initialize local members with values from the Field interface.
 
   @note called from Item::fix_fields.