diff options
| author | unknown <thek@adventure.(none)> | 2007-05-07 10:26:20 +0200 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-05-07 10:26:20 +0200 |
| commit | d3693efe8a89029c7b4bf404e4182850d4f7f4c4 (patch) | |
| tree | 3254a83ac5e3b28b0760e66ce4f52272ab8b1631 /sql/sp_head.h | |
| parent | 034c11f3cdac8b2b39dd8593d1fbad5b92f98879 (diff) | |
| parent | 72569cc66d2a1d8edcc3e368213619f7ea855329 (diff) | |
| download | mariadb-git-d3693efe8a89029c7b4bf404e4182850d4f7f4c4.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug26977/my50-bug26977
into adventure.(none):/home/thek/Development/cpp/bug26977/my51-bug26977
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
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 51ca529bed0..8ebba314ec5 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -992,6 +992,12 @@ public: virtual void print(String *str); + /* This instruction will not be short cut optimized. */ + virtual uint opt_shortcut_jump(sp_head *sp, sp_instr *start) + { + return m_ip; + } + virtual uint opt_mark(sp_head *sp, List<sp_instr> *leads); private: |