diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2008-01-25 10:37:29 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2008-01-25 10:37:29 -0700 |
| commit | bf541d14f29a589c01989d4da2540283f7f9d66f (patch) | |
| tree | 74fe704d2ae83b58d06940ffcf7a36638868fee0 /sql/sp_head.h | |
| parent | 0a1832268d84af51622699bedd8e2fd34c79f308 (diff) | |
| parent | 8f9e655dab1802d31be5c01ea5b5e9ccee01363c (diff) | |
| download | mariadb-git-bf541d14f29a589c01989d4da2540283f7f9d66f.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/handler.cc:
Manual merge
sql/item.cc:
Manual merge
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 01a4cb73704..8d7062740c8 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -888,8 +888,9 @@ public: virtual void backpatch(uint dest, sp_pcontext *dst_ctx) { - if (m_dest == 0) // Don't reset - m_dest= dest; + /* Calling backpatch twice is a logic flaw in jump resolution. */ + DBUG_ASSERT(m_dest == 0); + m_dest= dest; } /** |