diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:04:40 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:04:40 +0200 |
| commit | a04157fbb3f2b2e054c02968ffc82bb0eb971d58 (patch) | |
| tree | db1cb9732cc2b568c4a56c3f6d11cf8f4d5250b6 /sql/sp_head.h | |
| parent | 205f7a0583f5ba5cc0c6428fa6e44c74b534d8e8 (diff) | |
| parent | 9d3fda77c8e20ff299f9750b64c42dfbb58a7806 (diff) | |
| download | mariadb-git-a04157fbb3f2b2e054c02968ffc82bb0eb971d58.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 0139f879ce4..7f50f2a8202 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -634,9 +634,9 @@ class sp_instr_set : public sp_instr public: sp_instr_set(uint ip, sp_pcontext *ctx, - uint offset, Item *val, enum enum_field_types type, + uint offset, Item *val, enum enum_field_types type_arg, LEX *lex, bool lex_resp) - : sp_instr(ip, ctx), m_offset(offset), m_value(val), m_type(type), + : sp_instr(ip, ctx), m_offset(offset), m_value(val), m_type(type_arg), m_lex_keeper(lex, lex_resp) {} @@ -834,8 +834,9 @@ class sp_instr_freturn : public sp_instr public: sp_instr_freturn(uint ip, sp_pcontext *ctx, - Item *val, enum enum_field_types type, LEX *lex) - : sp_instr(ip, ctx), m_value(val), m_type(type), m_lex_keeper(lex, TRUE) + Item *val, enum enum_field_types type_arg, LEX *lex) + : sp_instr(ip, ctx), m_value(val), m_type(type_arg), + m_lex_keeper(lex, TRUE) {} virtual ~sp_instr_freturn() |