diff options
| author | unknown <knielsen@mysql.com> | 2006-05-15 18:41:04 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-05-15 18:41:04 +0200 |
| commit | 049a58003b385a5c7fbdc7ea62dbdcfe6d9f47bd (patch) | |
| tree | a8a7051669e6095a306ff6252f6105bf2e16a54f /sql/sp_head.h | |
| parent | cccd302c91a0bfb82ed6b387016a12a23420fb6f (diff) | |
| parent | dccd333ecf4d566029c40e18bee33f6019bc2420 (diff) | |
| download | mariadb-git-049a58003b385a5c7fbdc7ea62dbdcfe6d9f47bd.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.0-bug19633
into mysql.com:/usr/local/mysql/tmp-5.1
sql/sp_head.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sp_head.cc:
SCCS merged
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index fbc277b4de8..791343f0061 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -1170,6 +1170,6 @@ Item * sp_prepare_func_item(THD* thd, Item **it_addr); bool -sp_eval_expr(THD *thd, Field *result_field, Item *expr_item); +sp_eval_expr(THD *thd, Field *result_field, Item **expr_item_ptr); #endif /* _SP_HEAD_H_ */ |