diff options
| author | unknown <konstantin@mysql.com> | 2006-05-16 03:44:50 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-05-16 03:44:50 +0400 |
| commit | dd8c47efa8e5a43970ed9235e1a931b9c3e0e056 (patch) | |
| tree | a2ca3f2c46d0a92eab975952d0513df23ba289ab /sql/item.h | |
| parent | 90ffe5392ac7d697238d4269cbf2f7cd0b269868 (diff) | |
| parent | bb1c6bf6e42f74276c67fcaac9eb1b0891fadb01 (diff) | |
| download | mariadb-git-dd8c47efa8e5a43970ed9235e1a931b9c3e0e056.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-5.0-root
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item.h b/sql/item.h index ee8ac829515..19a57a10720 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(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); } |