diff options
| author | tsmith@ramayana.hindu.god <> | 2008-01-25 10:37:29 -0700 |
|---|---|---|
| committer | tsmith@ramayana.hindu.god <> | 2008-01-25 10:37:29 -0700 |
| commit | 3906cc27d76d544dcecb0fa6ef2ee2c58a8741a1 (patch) | |
| tree | 74fe704d2ae83b58d06940ffcf7a36638868fee0 /sql/sp_head.h | |
| parent | 5f6429b01a378b63abe9b88ae35e4922f66de674 (diff) | |
| parent | 21630ab91f60e66c81cab3bbaa6cea7fec359c7e (diff) | |
| download | mariadb-git-3906cc27d76d544dcecb0fa6ef2ee2c58a8741a1.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
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; } /** |