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

Merge mysql.com:/opt/local/work/mysql-5.0-root

Browse source 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
This commit is contained in:
unknown 2006-05-16 03:44:50 +04:00
commit dd8c47efa8
18 changed files with 342 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/item.h
View file

@ -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);
}