diff options
| author | unknown <pem@mysql.com> | 2005-11-22 13:24:53 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-11-22 13:24:53 +0100 |
| commit | d213bf04871436e743185c789b015e10766da272 (patch) | |
| tree | 86c284656a77326c24b551af05b4ea94db1c17ee /sql/sp_head.h | |
| parent | 929e6e05bedfaac9b9425cd84addef10a99b8919 (diff) | |
| parent | 6553362b96dcc681a01091ee3dd422681ebaf964 (diff) | |
| download | mariadb-git-d213bf04871436e743185c789b015e10766da272.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/usr/home/pem/show-sp-code/mysql-5.0
sql/sp_head.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sp_head.cc:
Merge fixes (STRING_WITH_LEN in string append calls).
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 8c2d58a696e..9addec706e7 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -304,6 +304,12 @@ public: return test(m_flags & (CONTAINS_DYNAMIC_SQL|MULTI_RESULTS|HAS_SET_AUTOCOMMIT_STMT)); } + +#ifndef DBUG_OFF + int show_routine_code(THD *thd); +#endif + + private: MEM_ROOT *m_thd_root; // Temp. store for thd's mem_root @@ -865,8 +871,8 @@ class sp_instr_cpush : public sp_instr public: - sp_instr_cpush(uint ip, sp_pcontext *ctx, LEX *lex) - : sp_instr(ip, ctx), m_lex_keeper(lex, TRUE) + sp_instr_cpush(uint ip, sp_pcontext *ctx, LEX *lex, uint offset) + : sp_instr(ip, ctx), m_lex_keeper(lex, TRUE), m_cursor(offset) {} virtual ~sp_instr_cpush() @@ -885,6 +891,7 @@ public: private: sp_lex_keeper m_lex_keeper; + uint m_cursor; /* Frame offset (for debugging) */ }; // class sp_instr_cpush : public sp_instr |