WL#1366: Use the schema (db) associated with an SP.

Phase 3: Made qualified names work for functions as well.

1 files changed, 6 insertions, 0 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index e68826ca56e..6d313a8ea66 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1107,7 +1107,10 @@ public:
     Item *it;
 
     if (execute(&it))
+    {
+      null_value= 1;
       return 0.0;
+    }
     return it->val();
   }
 
@@ -1116,7 +1119,10 @@ public:
     Item *it;
 
     if (execute(&it))
+    {
+      null_value= 1;
       return NULL;
+    }
     return it->val_str(str);
   }