After-merge fixes; some function signatures changed from Item * to Item **.

sql/item.cc:
  After-merge fixes.
sql/item.h:
  After-merge fixes.
sql/item_func.cc:
  After-merge fixes.
sql/item_func.h:
  After-merge fixes.
sql/sp_head.cc:
  After-merge fixes.

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/item.h b/sql/item.h
index 617690e1fd9..cfc2306f15d 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -404,7 +404,7 @@ public:
       FALSE if parameter value has been set,
       TRUE if error has occured.
   */
-  virtual bool set_value(THD *thd, sp_rcontext *ctx, Item *it)= 0;
+  virtual bool set_value(THD *thd, sp_rcontext *ctx, Item **it)= 0;
 };
 
 
@@ -928,7 +928,7 @@ public:
   inline Item_result result_type() const;
 
 private:
-  bool set_value(THD *thd, sp_rcontext *ctx, Item *it);
+  bool set_value(THD *thd, sp_rcontext *ctx, Item **it);
 
 public:
   Settable_routine_parameter *get_settable_routine_parameter()
@@ -2188,7 +2188,7 @@ public:
 
 private:
   void set_required_privilege(const bool rw);
-  bool set_value(THD *thd, sp_rcontext *ctx, Item *it);
+  bool set_value(THD *thd, sp_rcontext *ctx, Item **it);
 
 public:
   Settable_routine_parameter *get_settable_routine_parameter()
@@ -2196,7 +2196,7 @@ public:
     return (read_only ? 0 : this);
   }
 
-  bool set_value(THD *thd, Item *it)
+  bool set_value(THD *thd, Item **it)
   {
     return set_value(thd, NULL, it);
   }