MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:dlenev Date:November 17 2005 12:51am
Subject:bk commit into 5.0 tree (dlenev:1.1967) BUG#12329
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of dlenev. When dlenev 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.1967 05/11/17 03:51:14 dlenev@stripped +5 -0
  Fix for bug #13399 Crash when executing PS/SP which should activate trigger
  which is now dropped" and bug #12329 "Bogus error msg when executing PS with
  stored procedure after SP was re-created".

  sql/sp_head.cc
    1.197 05/11/17 03:51:07 dlenev@stripped +11 -10
    sp_head::add_used_tables_to_table_list():
      We have to copy database/table names and alias to PS/SP memory since current
      instance of sp_head object can pass away before next execution of PS/SP for
      which tables are added to prelocking list.
      This will be fixed by introducing of proper invalidation mechanism once new
      TDC is ready.

  mysql-test/t/trigger.test
    1.28 05/11/17 03:51:07 dlenev@stripped +39 -0
    Added test for bug #13399 Crash when executing PS/SP which should activate
    trigger which is now dropped".

  mysql-test/t/sp-error.test
    1.95 05/11/17 03:51:07 dlenev@stripped +22 -0
    Added test for bug #12329 "Bogus error msg when executing PS with stored
    procedure after SP was re-created".

  mysql-test/r/trigger.result
    1.22 05/11/17 03:51:07 dlenev@stripped +25 -0
    Added test for bug #13399 Crash when executing PS/SP which should activate
    trigger which is now dropped".

  mysql-test/r/sp-error.result
    1.91 05/11/17 03:51:07 dlenev@stripped +18 -0
    Added test for bug #12329 "Bogus error msg when executing PS with stored
    procedure after SP was re-created".

# 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:	dlenev
# Host:	brandersnatch.site
# Root:	/home/dlenev/src/mysql-5.0-bg13399-2

--- 1.21/mysql-test/r/trigger.result	2005-11-10 22:24:51 +03:00
+++ 1.22/mysql-test/r/trigger.result	2005-11-17 03:51:07 +03:00
@@ -738,3 +738,28 @@
 1
 drop trigger t1_bi;
 drop tables t1, t2;
+create table t1 (id int);
+create table t2 (id int);
+create trigger t1_bi before insert on t1 for each row insert into t2 values (new.id);
+prepare stmt1 from "insert into t1 values (10)";
+create procedure p1() insert into t1 values (10);
+call p1();
+drop trigger t1_bi;
+execute stmt1;
+call p1();
+deallocate prepare stmt1;
+drop procedure p1;
+create table t3 (id int);
+create trigger t1_bi after insert on t1 for each row insert into t2 values (new.id);
+prepare stmt1 from "insert into t1 values (10)";
+create procedure p1() insert into t1 values (10);
+call p1();
+drop trigger t1_bi;
+create trigger t1_bi after insert on t1 for each row insert into t3 values (new.id);
+execute stmt1;
+ERROR HY000: Table 't3' was not locked with LOCK TABLES
+call p1();
+ERROR HY000: Table 't3' was not locked with LOCK TABLES
+deallocate prepare stmt1;
+drop procedure p1;
+drop table t1, t2, t3;

--- 1.27/mysql-test/t/trigger.test	2005-09-15 03:56:03 +04:00
+++ 1.28/mysql-test/t/trigger.test	2005-11-17 03:51:07 +03:00
@@ -875,3 +875,42 @@
 drop view v1;
 drop table t1, t2, t3;
 --enable_parsing
+
+#
+# Test for bug #13399 "Crash when executing PS/SP which should activate
+# trigger which is now dropped". See also test for similar bug for stored
+# routines in sp-error.test (#12329).
+create table t1 (id int);
+create table t2 (id int);
+create trigger t1_bi before insert on t1 for each row insert into t2 values (new.id);
+prepare stmt1 from "insert into t1 values (10)";
+create procedure p1() insert into t1 values (10); 
+call p1();
+# Actually it is enough to do FLUSH TABLES instead of DROP TRIGGER
+drop trigger t1_bi;
+# Server should not crash on these two statements
+execute stmt1;
+call p1();
+deallocate prepare stmt1;
+drop procedure p1;
+
+# Let us test more complex situation when we alter trigger in such way that
+# it uses different set of tables (or simply add new trigger).
+create table t3 (id int);
+create trigger t1_bi after insert on t1 for each row insert into t2 values (new.id);
+prepare stmt1 from "insert into t1 values (10)";
+create procedure p1() insert into t1 values (10); 
+call p1();
+# Altering trigger forcing it use different set of tables
+drop trigger t1_bi;
+create trigger t1_bi after insert on t1 for each row insert into t3 values (new.id);
+# Until we implement proper mechanism for invalidation of PS/SP when table
+# or SP's are changed these two statements will fail with 'Table ... was
+# not locked' error (this mechanism should be based on the new TDC).
+--error 1100
+execute stmt1;
+--error 1100
+call p1();
+deallocate prepare stmt1;
+drop procedure p1;
+drop table t1, t2, t3;

--- 1.90/mysql-test/r/sp-error.result	2005-11-16 15:08:54 +03:00
+++ 1.91/mysql-test/r/sp-error.result	2005-11-17 03:51:07 +03:00
@@ -975,6 +975,24 @@
 END |
 drop table t1|
 drop function bug_13627_f|
+drop function if exists bug12329;
+create table t1 as select 1 a;
+create table t2 as select 1 a;
+create function bug12329() returns int return (select a from t1);
+prepare stmt1 from 'select bug12329()';
+execute stmt1;
+bug12329()
+1
+drop function bug12329;
+create function bug12329() returns int return (select a+100 from t2);
+select bug12329();
+bug12329()
+101
+execute stmt1;
+ERROR HY000: Table 't2' was not locked with LOCK TABLES
+deallocate prepare stmt1;
+drop function bug12329;
+drop table t1, t2;
 create database mysqltest1;
 use mysqltest1;
 drop database mysqltest1;

--- 1.94/mysql-test/t/sp-error.test	2005-11-16 15:08:54 +03:00
+++ 1.95/mysql-test/t/sp-error.test	2005-11-17 03:51:07 +03:00
@@ -1403,6 +1403,28 @@
 
 delimiter ;|
 
+# BUG#12329: "Bogus error msg when executing PS with stored procedure after
+# SP was re-created". See also test for related bug#13399 in trigger.test
+--disable_warnings
+drop function if exists bug12329;
+--enable_warnings
+create table t1 as select 1 a;
+create table t2 as select 1 a;
+create function bug12329() returns int return (select a from t1);
+prepare stmt1 from 'select bug12329()';
+execute stmt1;
+drop function bug12329;
+create function bug12329() returns int return (select a+100 from t2);
+select bug12329();
+# Until we implement proper mechanism for invalidation of PS/SP when table
+# or SP's are changed the following statement will fail with 'Table ... was
+# not locked' error (this mechanism should be based on the new TDC).
+--error 1100 
+execute stmt1;
+deallocate prepare stmt1;
+drop function bug12329; 
+drop table t1, t2;
+
 #
 # Bug#13514 "server crash when create a stored procedure before choose a
 # database" and

--- 1.196/sql/sp_head.cc	2005-11-16 15:08:54 +03:00
+++ 1.197/sql/sp_head.cc	2005-11-17 03:51:07 +03:00
@@ -2906,33 +2906,34 @@
   DBUG_ENTER("sp_head::add_used_tables_to_table_list");
 
   /*
-    Use persistent arena for table list allocation to be PS friendly.
+    Use persistent arena for table list allocation to be PS/SP friendly.
+    Note that we also have to copy database/table names and alias to PS/SP
+    memory since current instance of sp_head object can pass away before
+    next execution of PS/SP for which tables are added to prelocking list.
+    This will be fixed by introducing of proper invalidation mechanism
+    once new TDC is ready.
   */
   arena= thd->activate_stmt_arena_if_needed(&backup);
 
   for (i=0 ; i < m_sptabs.records ; i++)
   {
-    char *tab_buff;
+    char *tab_buff, *key_buff;
     TABLE_LIST *table;
     SP_TABLE *stab= (SP_TABLE *)hash_element(&m_sptabs, i);
     if (stab->temp)
       continue;
 
     if (!(tab_buff= (char *)thd->calloc(ALIGN_SIZE(sizeof(TABLE_LIST)) *
-                                        stab->lock_count)))
+                                        stab->lock_count)) ||
+        !(key_buff= (char*)thd->memdup(stab->qname.str,
+                                       stab->qname.length + 1)))
       DBUG_RETURN(FALSE);
 
     for (uint j= 0; j < stab->lock_count; j++)
     {
       table= (TABLE_LIST *)tab_buff;
 
-      /*
-        It's enough to just copy the pointers as the data will not change
-        during the lifetime of the SP. If the SP is used by PS, we assume
-        that the PS will be invalidated if the functions is deleted or
-        changed.
-      */
-      table->db= stab->qname.str;
+      table->db= key_buff;
       table->db_length= stab->db_length;
       table->table_name= table->db + table->db_length + 1;
       table->table_name_length= stab->table_name_length;
Thread
bk commit into 5.0 tree (dlenev:1.1967) BUG#12329dlenev17 Nov