diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-12-02 21:20:25 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-12-02 21:20:25 +0200 |
| commit | 5dac7516e2f3b2440a50cd0be036b6acea123dc8 (patch) | |
| tree | 5340b8e84501c9a79870d98ea17a6a9e2e4a3387 /sql/sp_head.cc | |
| parent | 79a46e0bf8fdc40fb1556d2ccfd95a79e50002ca (diff) | |
| parent | 4202271065969a00c310f832cd496cb6f3c095e5 (diff) | |
| download | mariadb-git-5dac7516e2f3b2440a50cd0be036b6acea123dc8.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
sql/sp_head.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/view.result:
SCCS merged
mysql-test/t/view.test:
SCCS merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 81e10e59a9b..ff4f898924c 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -954,8 +954,12 @@ int sp_head::execute(THD *thd) m_first_instance->m_first_free_instance= m_next_cached_sp; DBUG_PRINT("info", ("first free for 0x%lx ++: 0x%lx->0x%lx, level: %lu, flags %x", (ulong)m_first_instance, this, m_next_cached_sp, - m_next_cached_sp->m_recursion_level, - m_next_cached_sp->m_flags)); + (m_next_cached_sp ? + m_next_cached_sp->m_recursion_level : + 0), + (m_next_cached_sp ? + m_next_cached_sp->m_flags : + 0))); /* Check that if there are not any instances after this one then pointer to the last instance points on this instance or if there are |