bk commit into 5.0 tree (igor:1.1915) BUG#6120

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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.1915 05/07/12 08:34:57 igor@stripped +3 -0
  view.test, view.result:
    Expanded the test case for bug #6120 to cover
    DROP VIEW / CREATE VIEW scenario.
  sql_view.cc:
    Expanded the fix for bug #6120 to cover the case of
    DROP VIEW / CREATE_VIEW.

  mysql-test/t/view.test
    1.82 05/07/12 08:31:23 igor@stripped +3 -0
    Expanded the test case for bug #6120 to cover
    DROP VIEW / CREATE VIEW scenario.

  mysql-test/r/view.result
    1.87 05/07/12 08:33:00 igor@stripped +5 -0
    Expanded the test case for bug #6120 to cover
    DROP VIEW / CREATE VIEW scenario.

  sql/sql_view.cc
    1.53 05/07/12 08:33:56 igor@stripped +1 -0
    Expanded the fix for bug #6120 to cover the case of
    DROP VIEW / CREATE_VIEW.

# 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:	igor
# Host:	igor-inspiron.creware.com
# Root:	/home/igor/dev/mysql-5.0-0

--- 1.86/mysql-test/r/view.result	Tue Jul 12 07:26:16 2005
+++ 1.87/mysql-test/r/view.result	Tue Jul 12 08:33:00 2005
@@ -1945,6 +1945,11 @@
 CALL p1();
 s1	s2
 1	2
+DROP VIEW v1;
+CREATE VIEW v1 AS SELECT s2 AS s1, s1 AS s2 FROM t1;
+CALL p1();
+s1	s2
+2	1
 DROP PROCEDURE p1;
 DROP VIEW v1;
 DROP TABLE t1;

--- 1.81/mysql-test/t/view.test	Tue Jul 12 07:26:16 2005
+++ 1.82/mysql-test/t/view.test	Tue Jul 12 08:31:23 2005
@@ -1784,6 +1784,9 @@
 CALL p1();
 ALTER VIEW v1 AS SELECT s1 AS s1, s2 AS s2 FROM t1;
 CALL p1();
+DROP VIEW v1;
+CREATE VIEW v1 AS SELECT s2 AS s1, s1 AS s2 FROM t1;
+CALL p1();
 
 DROP PROCEDURE p1;
 DROP VIEW v1;

--- 1.52/sql/sql_view.cc	Wed Jul  6 08:25:58 2005
+++ 1.53/sql/sql_view.cc	Tue Jul 12 08:33:56 2005
@@ -1004,6 +1004,7 @@
     if (my_delete(path, MYF(MY_WME)))
       goto err;
     query_cache_invalidate3(thd, view, 0);
+    sp_cache_invalidate();
     VOID(pthread_mutex_unlock(&LOCK_open));
   }
   send_ok(thd);