diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-13 17:30:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-13 17:30:37 +0200 |
| commit | 8fa759a5762733d9f8a4050437fadcd255ecd1a2 (patch) | |
| tree | 093c167478abbbf6f51cd47f8df8651ee17f97f1 /sql/sp_head.cc | |
| parent | 014e1258309da2475b8ae36d445261f87422adaf (diff) | |
| parent | 3466b47b0d2f0aca0a2191574c593c7eaea0b0b8 (diff) | |
| download | mariadb-git-8fa759a5762733d9f8a4050437fadcd255ecd1a2.tar.gz | |
Merge 10.3 into 10.4
We disable the MDEV-21189 test galera.galera_partition
because it times out.
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 8631d800001..eb3c35a4492 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -2627,7 +2627,7 @@ sp_head::backpatch_goto(THD *thd, sp_label *lab,sp_label *lab_begin_block) } if (bp->instr_type == CPOP) { - uint n= lab->ctx->diff_cursors(lab_begin_block->ctx, true); + uint n= bp->instr->m_ctx->diff_cursors(lab_begin_block->ctx, true); if (n == 0) { // Remove cpop instr @@ -2644,7 +2644,7 @@ sp_head::backpatch_goto(THD *thd, sp_label *lab,sp_label *lab_begin_block) } if (bp->instr_type == HPOP) { - uint n= lab->ctx->diff_handlers(lab_begin_block->ctx, true); + uint n= bp->instr->m_ctx->diff_handlers(lab_begin_block->ctx, true); if (n == 0) { // Remove hpop instr @@ -3149,6 +3149,8 @@ void sp_head::optimize() sp_instr *i; uint src, dst; + DBUG_EXECUTE_IF("sp_head_optimize_disable", return; ); + opt_mark(); bp.empty(); |