mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-05 22:55:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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.
This commit is contained in:
unknown 2006-05-15 19:57:10 +02:00
commit 798e910bad
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/item.cc
View file

@ -958,7 +958,7 @@ void Item_splocal::print(String *str)
} }
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); return ctx->set_variable(thd, get_var_idx(), it);
} }
@ -5375,9 +5375,9 @@ void Item_trigger_field::set_required_privilege(const bool rw)
} }
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)) || return (!item || (!fixed && fix_fields(thd, 0)) ||
(item->save_in_field(field, 0) < 0)); (item->save_in_field(field, 0) < 0));

8
sql/item.h
View file

@ -404,7 +404,7 @@ public:
FALSE if parameter value has been set, FALSE if parameter value has been set,
TRUE if error has occured. 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; inline Item_result result_type() const;
private: private:
bool set_value(THD *thd, sp_rcontext *ctx, Item *it); bool set_value(THD *thd, sp_rcontext *ctx, Item **it);
public: public:
Settable_routine_parameter *get_settable_routine_parameter() Settable_routine_parameter *get_settable_routine_parameter()
@ -2188,7 +2188,7 @@ public:
private: private:
void set_required_privilege(const bool rw); 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: public:
Settable_routine_parameter *get_settable_routine_parameter() Settable_routine_parameter *get_settable_routine_parameter()
@ -2196,7 +2196,7 @@ public:
return (read_only ? 0 : this); 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); return set_value(thd, NULL, it);
} }

6
sql/item_func.cc
View file

@ -4121,14 +4121,14 @@ bool Item_func_get_user_var::eq(const Item *item, bool binary_cmp) const
bool Item_func_get_user_var::set_value(THD *thd, 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 Item_func_set_user_var is not fixed after construction, call
fix_fields(). fix_fields().
*/ */
return (!suv || suv->fix_fields(thd, &it) || suv->check() || suv->update()); return (!suv || suv->fix_fields(thd, it) || suv->check() || suv->update());
} }

2
sql/item_func.h
View file

@ -1209,7 +1209,7 @@ public:
bool eq(const Item *item, bool binary_cmp) const; bool eq(const Item *item, bool binary_cmp) const;
private: private:
bool set_value(THD *thd, sp_rcontext *ctx, Item *it); bool set_value(THD *thd, sp_rcontext *ctx, Item **it);
public: public:
Settable_routine_parameter *get_settable_routine_parameter() Settable_routine_parameter *get_settable_routine_parameter()

4
sql/sp_head.cc
View file

@ -1552,7 +1552,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
DBUG_ASSERT(srp); 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; err_status= TRUE;
break; break;
@ -2393,7 +2393,7 @@ sp_instr_set_trigger_field::execute(THD *thd, uint *nextp)
int int
sp_instr_set_trigger_field::exec_core(THD *thd, uint *nextp) 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; *nextp = m_ip+1;
return res; return res;
} }