bk commit into 5.0 tree (gkodinov:1.2222)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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@stripped, 2006-07-31 17:40:09+03:00, gkodinov@stripped +2 -0
  Merge bk-internal:/home/bk/mysql-5.0-opt
  into  macbook.gmz:/Users/kgeorge/mysql/work/B21080-5.0-opt
  MERGE: 1.2214.2.1

  mysql-test/r/view.result@stripped, 2006-07-31 17:40:03+03:00, gkodinov@stripped +0 -0
    merge
    MERGE: 1.166.1.1

  mysql-test/t/view.test@stripped, 2006-07-31 17:40:03+03:00, gkodinov@stripped +0 -2
    merge
    MERGE: 1.151.1.1

# 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:	gkodinov
# Host:	macbook.gmz
# Root:	/Users/kgeorge/mysql/work/B21080-5.0-opt/RESYNC

--- 1.167/mysql-test/r/view.result	2006-07-31 17:40:24 +03:00
+++ 1.168/mysql-test/r/view.result	2006-07-31 17:40:24 +03:00
@@ -2807,6 +2807,17 @@ yadda
 yad
 DROP VIEW v1;
 DROP TABLE t1;
+CREATE TABLE t1 (x INT, y INT);
+CREATE ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW v1 AS SELECT x FROM t1;
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `v1` AS select `t1`.`x` AS `x` from `t1`
+ALTER VIEW v1 AS SELECT x, y FROM t1;
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `v1` AS select `t1`.`x` AS `x`,`t1`.`y` AS `y` from `t1`
+DROP VIEW v1;
+DROP TABLE t1;
 CREATE TABLE t1 (s1 char);
 INSERT INTO t1 VALUES ('Z');
 CREATE VIEW v1 AS SELECT s1 collate latin1_german1_ci AS col FROM t1;

--- 1.152/mysql-test/t/view.test	2006-07-31 17:40:24 +03:00
+++ 1.153/mysql-test/t/view.test	2006-07-31 17:40:24 +03:00
@@ -2669,6 +2669,17 @@ DROP VIEW v1;
 DROP TABLE t1;
 
 #
+#Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
+#
+CREATE TABLE t1 (x INT, y INT);
+CREATE ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW v1 AS SELECT x FROM t1;
+SHOW CREATE VIEW v1;
+
+ALTER VIEW v1 AS SELECT x, y FROM t1;
+SHOW CREATE VIEW v1;
+
+DROP VIEW v1;
+DROP TABLE t1;
 # Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE 
 # clause is called
 #