diff options
| author | unknown <knielsen@mysql.com> | 2006-05-15 19:57:10 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-05-15 19:57:10 +0200 |
| commit | 798e910bad712f24144a04403bcc46de04ead643 (patch) | |
| tree | 5c90e354587c8207f12674d3d36bc1b67a2d47a8 /sql/item.cc | |
| parent | 438131dde2ea8a3f976a9c3f7965229e097334e9 (diff) | |
| download | mariadb-git-798e910bad712f24144a04403bcc46de04ead643.tar.gz | |
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.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index fbdb0aa687b..ba378e56cb0 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -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); } @@ -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)) || (item->save_in_field(field, 0) < 0)); |