From 4940a91a5f57da21714b04dce77c425c2db6195c Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.org>
Date: Mon, 15 Aug 2016 17:04:55 +0400
Subject: [PATCH] A test clean-up for 7c78b27a33b749656cbc28091eac32bbbeee9e42

---
 .../suite/compat/oracle/r/sp-code.result       | 18 +++++++++---------
 mysql-test/suite/compat/oracle/t/sp-code.test  |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mysql-test/suite/compat/oracle/r/sp-code.result b/mysql-test/suite/compat/oracle/r/sp-code.result
index 56339e636c34e..751549b75004d 100644
--- a/mysql-test/suite/compat/oracle/r/sp-code.result
+++ b/mysql-test/suite/compat/oracle/r/sp-code.result
@@ -77,19 +77,14 @@ BEGIN
 v:=123;
 END;
 BEGIN
-EXCEPTION
-WHEN 1002 THEN v:=225;
 END;
 /
 SHOW PROCEDURE CODE p1;
 Pos	Instruction
 0	hpush_jump 3 1 EXIT
 1	set v@0 123
-2	hreturn 0 6
-3	hpush_jump 6 1 EXIT
-4	set v@0 225
-5	hreturn 0 6
-6	hpop 2
+2	hreturn 0 3
+3	hpop 1
 set @v= 10;
 CALL p1(@v);
 SELECT @v;
@@ -104,14 +99,19 @@ BEGIN
 v:=123;
 END;
 BEGIN
+EXCEPTION
+WHEN 1002 THEN v:=225;
 END;
 /
 SHOW PROCEDURE CODE p1;
 Pos	Instruction
 0	hpush_jump 3 1 EXIT
 1	set v@0 123
-2	hreturn 0 3
-3	hpop 1
+2	hreturn 0 6
+3	hpush_jump 6 1 EXIT
+4	set v@0 225
+5	hreturn 0 6
+6	hpop 2
 set @v= 10;
 CALL p1(@v);
 SELECT @v;
diff --git a/mysql-test/suite/compat/oracle/t/sp-code.test b/mysql-test/suite/compat/oracle/t/sp-code.test
index 229fc053c7ea0..ff78410540c7e 100644
--- a/mysql-test/suite/compat/oracle/t/sp-code.test
+++ b/mysql-test/suite/compat/oracle/t/sp-code.test
@@ -72,8 +72,6 @@ IS
    v:=123;
   END;
 BEGIN
-EXCEPTION
-  WHEN 1002 THEN v:=225;
 END;
 /
 DELIMITER ;/
@@ -93,6 +91,8 @@ IS
    v:=123;
   END;
 BEGIN
+EXCEPTION
+  WHEN 1002 THEN v:=225;
 END;
 /
 DELIMITER ;/