bk commit into 5.0 tree (knielsen:1.2141)

[knielsen]

Below is the list of changes that have just been committed into a local
5.0 repository of knielsen. When knielsen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2141 06/05/15 13:28:15 knielsen@stripped +5 -0
  After-merge fixes; some function signatures changed from Item * to Item **.

  sql/sp_head.cc
    1.213 06/05/15 13:28:10 knielsen@stripped +2 -2
    After-merge fixes.

  sql/item_func.h
    1.140 06/05/15 13:28:10 knielsen@stripped +1 -1
    After-merge fixes.

  sql/item_func.cc
    1.286 06/05/15 13:28:10 knielsen@stripped +3 -3
    After-merge fixes.

  sql/item.h
    1.195 06/05/15 13:28:10 knielsen@stripped +4 -4
    After-merge fixes.

  sql/item.cc
    1.221 06/05/15 13:28:10 knielsen@stripped +3 -3
    After-merge fixes.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/tmp-5.0

--- 1.220/sql/item.cc	2006-05-14 22:51:01 +02:00
+++ 1.221/sql/item.cc	2006-05-15 13:28:10 +02:00
@@ -958,7 +958,7 @@
 }
 
 
-bool Item_splocal::set_value(THD *thd, sp_rcontext *ctx, Item *it)
+bool Item_splocal::set_value(THD *thd, sp_rcontext *ctx, Item **it)
 {
   return ctx->set_variable(thd, get_var_idx(), it);
 }
@@ -5375,9 +5375,9 @@
 }
 
 
-bool Item_trigger_field::set_value(THD *thd, sp_rcontext */*ctx*/, Item *it)
+bool Item_trigger_field::set_value(THD *thd, sp_rcontext */*ctx*/, Item **it)
 {
-  Item *item= sp_prepare_func_item(thd, &it);
+  Item *item= sp_prepare_func_item(thd, it);
 
   return (!item || (!fixed && fix_fields(thd, 0)) ||
           (item->save_in_field(field, 0) < 0));

--- 1.194/sql/item.h	2006-05-12 11:55:14 +02:00
+++ 1.195/sql/item.h	2006-05-15 13:28:10 +02:00
@@ -404,7 +404,7 @@
       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 @@
   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 @@
 
 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 @@
     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);
   }

--- 1.285/sql/item_func.cc	2006-05-14 22:51:01 +02:00
+++ 1.286/sql/item_func.cc	2006-05-15 13:28:10 +02:00
@@ -4121,14 +4121,14 @@
 
 
 bool Item_func_get_user_var::set_value(THD *thd,
-                                       sp_rcontext */*ctx*/, Item *it)
+                                       sp_rcontext */*ctx*/, Item **it)
 {
-  Item_func_set_user_var *suv= new Item_func_set_user_var(get_name(), it);
+  Item_func_set_user_var *suv= new Item_func_set_user_var(get_name(), *it);
   /*
     Item_func_set_user_var is not fixed after construction, call
     fix_fields().
   */
-  return (!suv || suv->fix_fields(thd, &it) || suv->check() || suv->update());
+  return (!suv || suv->fix_fields(thd, it) || suv->check() || suv->update());
 }
 
 

--- 1.139/sql/item_func.h	2006-05-14 22:51:01 +02:00
+++ 1.140/sql/item_func.h	2006-05-15 13:28:10 +02:00
@@ -1209,7 +1209,7 @@
   bool eq(const Item *item, bool binary_cmp) 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()

--- 1.212/sql/sp_head.cc	2006-05-15 12:41:21 +02:00
+++ 1.213/sql/sp_head.cc	2006-05-15 13:28:10 +02:00
@@ -1552,7 +1552,7 @@
 
       DBUG_ASSERT(srp);
 
-      if (srp->set_value(thd, octx, nctx->get_item(i)))
+      if (srp->set_value(thd, octx, nctx->get_item_addr(i)))
       {
         err_status= TRUE;
         break;
@@ -2393,7 +2393,7 @@
 int
 sp_instr_set_trigger_field::exec_core(THD *thd, uint *nextp)
 {
-  const int res= (trigger_field->set_value(thd, value) ? -1 : 0);
+  const int res= (trigger_field->set_value(thd, &value) ? -1 : 0);
   *nextp = m_ip+1;
   return res;
 }