merge

sql/sp_head.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_cache.cc:
  marge

mysql-test/r/sp.result

@@ -2321,3 +2321,16 @@ select `foo` ();
 `foo` ()
 5
 drop function `foo`;
+drop procedure if exists p1;
+create table t1(id int);
+insert into t1 values(1);
+create procedure p1()
+begin
+declare i int;
+select max(id)+1 into i from t1;
+end
+//
+call p1()//
+call p1()//
+drop procedure p1;
+drop table t1;

mysql-test/r/view_query_cache.result

+drop table if exists t1,t2,v1,v2,v3;
+drop view if exists t1,t2,v1,v2,v3;
 set GLOBAL query_cache_size=1355776;
 flush status;
 create table t1 (a int, b int);
@@ -98,4 +100,27 @@ Qcache_hits	1
 drop view v1;
 set query_cache_type=default;
 drop table t1;
+create table t1 (a int);
+insert into t1 values (1), (2), (3);
+create view v1 as select a from t1 where a > 1;
+select * from v1;
+a
+2
+3
+alter view v1 as select a from t1 where a > 2;
+select * from v1;
+a
+3
+drop view v1;
+select * from v1;
+ERROR 42S02: Table 'test.v1' doesn't exist
+drop table t1;
+create table t1 (a int, primary key (a), b int);
+create table t2 (a int, primary key (a), b int);
+insert into t2 values (1000, 2000);
+create view v3 (a,b) as select t1.a as a, t2.a as b from t1, t2;
+select * from v3;
+a	b
+drop view v3;
+drop table t1, t2;
 set GLOBAL query_cache_size=default;

mysql-test/t/sp.test

@@ -2739,3 +2739,24 @@ drop function if exists foo;
 create function `foo` () returns int return 5;
 select `foo` ();
 drop function `foo`;
+
+#
+# rolling back temporary Item tree changes in SP
+#
+--disable_warnings
+drop procedure if exists p1;
+--enable_warnings
+create table t1(id int);
+insert into t1 values(1);
+delimiter //;
+create procedure p1()
+begin
+  declare i int;
+  select max(id)+1 into i from t1;
+end
+//
+call p1()//
+call p1()//
+delimiter ;//
+drop procedure p1;
+drop table t1;

mysql-test/t/view_query_cache.test

@@ -2,6 +2,11 @@
 #
 # QUERY CACHE options for VIEWs
 #
+--disable_warnings
+drop table if exists t1,t2,v1,v2,v3;
+drop view if exists t1,t2,v1,v2,v3;
+--enable_warnings
+
 set GLOBAL query_cache_size=1355776;
 flush status;
 create table t1 (a int, b int);
@@ -53,6 +58,30 @@ drop view v1;
 set query_cache_type=default;
 
 drop table t1;
-set GLOBAL query_cache_size=default;
 
+#
+# invalidation of view
+#
+create table t1 (a int);
+insert into t1 values (1), (2), (3);
+create view v1 as select a from t1 where a > 1;
+select * from v1;
+alter view v1 as select a from t1 where a > 2;
+select * from v1;
+drop view v1;
+-- error 1146
+select * from v1;
+drop table t1;
+
+#
+# join view with QC
+#
+create table t1 (a int, primary key (a), b int);
+create table t2 (a int, primary key (a), b int);
+insert into t2 values (1000, 2000);
+create view v3 (a,b) as select t1.a as a, t2.a as b from t1, t2;
+select * from v3;
+drop view v3;
+drop table t1, t2;
 
+set GLOBAL query_cache_size=default;

sql/sp_head.cc

@@ -482,6 +482,7 @@ sp_head::execute(THD *thd)
       break;
     DBUG_PRINT("execute", ("Instruction %u", ip));
     ret= i->execute(thd, &ip);
+    thd->rollback_item_tree_changes();
     if (i->free_list)
       cleanup_items(i->free_list);
     // Check if an exception has occurred and a handler has been found

sql/sql_cache.h

@@ -285,6 +285,10 @@ class Query_cache
   void invalidate_table(TABLE *table);
   void invalidate_table(byte *key, uint32  key_length);
   void invalidate_table(Query_cache_block *table_block);
+  TABLE_COUNTER_TYPE
+    register_tables_from_list(TABLE_LIST *tables_used,
+                              TABLE_COUNTER_TYPE counter,
+                              Query_cache_block_table *block_table);
   my_bool register_all_tables(Query_cache_block *block,
 			      TABLE_LIST *tables_used,
 			      TABLE_COUNTER_TYPE tables);

sql/sql_view.cc

@@ -305,6 +305,8 @@ bool mysql_create_view(THD *thd,
   VOID(pthread_mutex_lock(&LOCK_open));
   res= mysql_register_view(thd, view, mode);
   VOID(pthread_mutex_unlock(&LOCK_open));
+  if (view->revision != 1)
+    query_cache_invalidate3(thd, view, 0);
   start_waiting_global_read_lock(thd);
   if (res)
     goto err;
@@ -912,6 +914,7 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
     }
     if (my_delete(path, MYF(MY_WME)))
       goto err;
+    query_cache_invalidate3(thd, view, 0);
     VOID(pthread_mutex_unlock(&LOCK_open));
   }
   send_ok(thd);