diff options
| author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2008-01-23 15:36:57 -0700 |
|---|---|---|
| committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2008-01-23 15:36:57 -0700 |
| commit | 9d96bb98a6b010ae708e481c22b0938a7e03c527 (patch) | |
| tree | df28f0505d70db18b9ba5e1f32959cbcde27b87a /sql/sp_head.h | |
| parent | fca38dd705a655cf64e2826b7b693148844b8690 (diff) | |
| parent | 8430df5a07e7175d2ff2a43dd80ac8f20538887d (diff) | |
| download | mariadb-git-9d96bb98a6b010ae708e481c22b0938a7e03c527.tar.gz | |
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-33618
mysql-test/r/sp-code.result:
Auto merged
mysql-test/t/sp-code.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sp_rcontext.cc:
Auto merged
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 86a77a434ff..288584ff200 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -877,8 +877,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; } /* |