List:Internals« Previous MessageNext Message »
From:Konstantin Osipov Date:August 19 2005 12:56pm
Subject:bk commit into 5.0 tree (konstantin:1.1997)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1997 05/08/19 16:56:35 konstantin@stripped +4 -0
  Whenever we remove an instruction during optimization, we need to
  adjust instruction numbers (ip - instruction pointer) stored in all
  instructions. In addition to that, sp_instr_hpush_jump, which 
  corresponds to DECLARE CONTINUE HANDLER needs adjustment for m_handler,
  which holds the number of instruction with the continue handler.
  In the bug report, a wrong ip stored in m_handler was pointing at 
  FETCH, which resulted in an error message and abnormal SP termination.
  The fix is to just remove m_handler member from sp_instr_hpush_jump,
  as it's always points to the instruction next to the DECLARE
  statement itself (m_ip+1).

  sql/sp_head.h
    1.65 05/08/19 16:56:28 konstantin@stripped +0 -2
    Remove m_handler (the number of continue handler instruction)
    as it always equal to m_ip+1

  sql/sp_head.cc
    1.168 05/08/19 16:56:28 konstantin@stripped +2 -2
    Remove m_handler (the number of continue handler instruction)
    as it always equal to m_ip+1

  mysql-test/t/sp.test
    1.139 05/08/19 16:56:28 konstantin@stripped +66 -0
    A test case for Bug#12168 "'DECLARE CONTINUE HANDLER FOR NOT
    FOUND ...' in conditional handled incorrectly"

  mysql-test/r/sp.result
    1.144 05/08/19 16:56:28 konstantin@stripped +66 -0
    Test results fixed (Bug#12168)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	oak.local
# Root:	/home/kostja/mysql/mysql-5.0-12168

--- 1.143/mysql-test/r/sp.result	2005-08-18 13:23:47 +04:00
+++ 1.144/mysql-test/r/sp.result	2005-08-19 16:56:28 +04:00
@@ -3100,4 +3100,70 @@
 call p_bug11247(10)|
 drop function f_bug11247|
 drop procedure p_bug11247|
+drop procedure if exists bug12168|
+drop table if exists t1, t2|
+create table t1 (a int)|
+insert into t1 values (1),(2),(3),(4)|
+create table t2 (a int)|
+create procedure bug12168(arg1 char(1))
+begin
+declare b, c integer;
+if arg1 = 'a' then
+begin
+declare c1 cursor for select a from t1 where a % 2;
+declare continue handler for not found set b = 1;
+set b = 0;
+open c1;
+c1_repeat: repeat
+fetch c1 into c;
+if (b = 1) then
+leave c1_repeat;
+end if;
+insert into t2 values (c);
+until b = 1
+end repeat;
+end;
+end if;
+if arg1 = 'b' then
+begin
+declare c2 cursor for select a from t1 where not a % 2;
+declare continue handler for not found set b = 1;
+set b = 0;
+open c2;
+c2_repeat: repeat
+fetch c2 into c;
+if (b = 1) then
+leave c2_repeat;
+end if;
+insert into t2 values (c);
+until b = 1
+end repeat;
+end;
+end if;
+end|
+call bug12168('a')|
+select * from t2|
+a
+1
+3
+truncate t2|
+call bug12168('b')|
+select * from t2|
+a
+2
+4
+truncate t2|
+call bug12168('a')|
+select * from t2|
+a
+1
+3
+truncate t2|
+call bug12168('b')|
+select * from t2|
+a
+2
+4
+truncate t2|
+drop procedure if exists bug12168|
 drop table t1,t2;

--- 1.138/mysql-test/t/sp.test	2005-08-18 13:23:47 +04:00
+++ 1.139/mysql-test/t/sp.test	2005-08-19 16:56:28 +04:00
@@ -3928,6 +3928,72 @@
 call p_bug11247(10)|
 drop function f_bug11247|
 drop procedure p_bug11247|
+#
+# BUG#12168: "'DECLARE CONTINUE HANDLER FOR NOT FOUND ...' in conditional
+# handled incorrectly"
+#
+--disable_warnings
+drop procedure if exists bug12168|
+drop table if exists t1, t2|
+--enable_warnings
+
+create table t1 (a int)|
+insert into t1 values (1),(2),(3),(4)|
+
+create table t2 (a int)|
+
+create procedure bug12168(arg1 char(1))
+begin
+  declare b, c integer;
+  if arg1 = 'a' then
+    begin
+      declare c1 cursor for select a from t1 where a % 2;
+      declare continue handler for not found set b = 1;
+      set b = 0;
+      open c1;
+      c1_repeat: repeat
+        fetch c1 into c;
+        if (b = 1) then
+          leave c1_repeat;
+        end if;
+
+        insert into t2 values (c);
+        until b = 1
+      end repeat;
+    end;
+  end if;
+  if arg1 = 'b' then
+    begin
+      declare c2 cursor for select a from t1 where not a % 2;
+      declare continue handler for not found set b = 1;
+      set b = 0;
+      open c2;
+      c2_repeat: repeat
+        fetch c2 into c;
+        if (b = 1) then
+          leave c2_repeat;
+        end if;
+
+        insert into t2 values (c);
+        until b = 1
+      end repeat;
+    end;
+  end if;
+end|
+
+call bug12168('a')|
+select * from t2|
+truncate t2|
+call bug12168('b')|
+select * from t2|
+truncate t2|
+call bug12168('a')|
+select * from t2|
+truncate t2|
+call bug12168('b')|
+select * from t2|
+truncate t2|
+drop procedure if exists bug12168|
 
 #
 # BUG#NNNN: New bug synopsis

--- 1.167/sql/sp_head.cc	2005-08-18 13:23:47 +04:00
+++ 1.168/sql/sp_head.cc	2005-08-19 16:56:28 +04:00
@@ -1986,7 +1986,7 @@
   sp_cond_type_t *p;
 
   while ((p= li++))
-    thd->spcont->push_handler(p, m_handler, m_type, m_frame);
+    thd->spcont->push_handler(p, m_ip+1, m_type, m_frame);
 
   *nextp= m_dest;
   DBUG_RETURN(0);
@@ -2003,7 +2003,7 @@
   str->append(" f=");
   str->qs_append(m_frame);
   str->append(" h=");
-  str->qs_append(m_handler);
+  str->qs_append(m_ip+1);
 }
 
 uint

--- 1.64/sql/sp_head.h	2005-08-03 07:44:29 +04:00
+++ 1.65/sql/sp_head.h	2005-08-19 16:56:28 +04:00
@@ -714,7 +714,6 @@
   sp_instr_hpush_jump(uint ip, sp_pcontext *ctx, int htype, uint fp)
     : sp_instr_jump(ip, ctx), m_type(htype), m_frame(fp)
   {
-    m_handler= ip+1;
     m_cond.empty();
   }
 
@@ -743,7 +742,6 @@
 
   int m_type;			// Handler type
   uint m_frame;
-  uint m_handler;		// Location of handler
   List<struct sp_cond_type> m_cond;
 
 }; // class sp_instr_hpush_jump : public sp_instr_jump
Thread
bk commit into 5.0 tree (konstantin:1.1997)Konstantin Osipov19 Aug