From: kgeorge
Date: July 27 2006 2:53pm
Subject: bk commit into 5.0 tree (gkodinov:1.2216) BUG#21080
List-Archive: http://lists.mysql.com/commits/9670
X-Bug: 21080
Message-Id: <20060727145318.E794B279111@macbook.gmz>

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-27 17:53:00+03:00, gkodinov@stripped +6 -0
  Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
    When executing ALTER TABLE all the attributes of the view were overwritten.
    This is contrary to the user's expectations.
    So some of the view attributes are preserved now : namely security and 
    algorithm. This means that if they are not specified in ALTER VIEW
    their values are preserved from CREATE VIEW instead of being defaulted.

  mysql-test/r/view.result@stripped, 2006-07-27 17:52:49+03:00, gkodinov@stripped +11 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - test suite

  mysql-test/t/view.test@stripped, 2006-07-27 17:52:50+03:00, gkodinov@stripped +13 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - test suite

  sql/sql_lex.h@stripped, 2006-07-27 17:52:51+03:00, gkodinov@stripped +1 -1
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - must make create_view_suid a tristate : on/off/unspecified

  sql/sql_view.cc@stripped, 2006-07-27 17:52:52+03:00, gkodinov@stripped +56 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - open the view to get it's attributes and put then as defaults 
       for ALTER VIEW

  sql/sql_yacc.yy@stripped, 2006-07-27 17:52:52+03:00, gkodinov@stripped +3 -3
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - must make create_view_suid a tristate : on/off/unspecified

  sql/table.h@stripped, 2006-07-27 17:52:53+03:00, gkodinov@stripped +4 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - must make create_view_suid a tristate : on/off/unspecified

# 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

--- 1.222/sql/sql_lex.h	2006-07-27 17:53:17 +03:00
+++ 1.223/sql/sql_lex.h	2006-07-27 17:53:17 +03:00
@@ -978,7 +978,7 @@ typedef struct st_lex : public Query_tab
   /*
     view created to be run from definer (standard behaviour)
   */
-  bool create_view_suid;
+  uint8 create_view_suid;
   /* Characterstics of trigger being created */
   st_trg_chistics trg_chistics;
   /*

--- 1.475/sql/sql_yacc.yy	2006-07-27 17:53:17 +03:00
+++ 1.476/sql/sql_yacc.yy	2006-07-27 17:53:17 +03:00
@@ -8997,11 +8997,11 @@ view_algorithm_opt:
 
 view_suid:
 	/* empty */
-	{ Lex->create_view_suid= TRUE; }
+	{ Lex->create_view_suid= VIEW_SUID_DEFAULT; }
 	| SQL_SYM SECURITY_SYM DEFINER_SYM
-	{ Lex->create_view_suid= TRUE; }
+	{ Lex->create_view_suid= VIEW_SUID_DEFINER; }
 	| SQL_SYM SECURITY_SYM INVOKER_SYM
-	{ Lex->create_view_suid= FALSE; }
+	{ Lex->create_view_suid= VIEW_SUID_INVOKER; }
 	;
 
 view_tail:

--- 1.130/sql/table.h	2006-07-27 17:53:17 +03:00
+++ 1.131/sql/table.h	2006-07-27 17:53:17 +03:00
@@ -360,6 +360,10 @@ typedef struct st_schema_table
 #define VIEW_ALGORITHM_TMPTABLE         1
 #define VIEW_ALGORITHM_MERGE            2
 
+#define VIEW_SUID_INVOKER               0
+#define VIEW_SUID_DEFINER               1
+#define VIEW_SUID_DEFAULT               2
+
 /* view WITH CHECK OPTION parameter options */
 #define VIEW_CHECK_NONE       0
 #define VIEW_CHECK_LOCAL      1

--- 1.166/mysql-test/r/view.result	2006-07-27 17:53:18 +03:00
+++ 1.167/mysql-test/r/view.result	2006-07-27 17:53:18 +03:00
@@ -2807,3 +2807,14 @@ 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;

--- 1.151/mysql-test/t/view.test	2006-07-27 17:53:18 +03:00
+++ 1.152/mysql-test/t/view.test	2006-07-27 17:53:18 +03:00
@@ -2667,3 +2667,16 @@ SELECT * FROM v1;
 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;

--- 1.89/sql/sql_view.cc	2006-07-27 17:53:18 +03:00
+++ 1.90/sql/sql_view.cc	2006-07-27 17:53:18 +03:00
@@ -155,6 +155,54 @@ err:
   DBUG_RETURN(TRUE);
 }
 
+/*
+  Fill defined view parts
+
+  SYNOPSIS
+    fill_defined_view_parts()
+      thd                current thread.
+      view               view to operate on
+
+  DESCRIPTION
+    This function will initialize the parts of the view 
+    definition that are not specified in ALTER VIEW
+    to their values from CREATE VIEW.
+    The view must be opened to get it's definition.
+    We use a copy of the view when opening because we want 
+    to preserve the original view instance.
+
+  RETURN VALUE
+    TRUE                 can't open table
+    FALSE                success
+*/
+static bool
+fill_defined_view_parts (THD *thd, TABLE_LIST *view)
+{
+  LEX *lex= thd->lex;
+  bool not_used;
+  TABLE_LIST decoy;
+
+  memcpy (&decoy, view, sizeof (TABLE_LIST));
+  if (!open_table(thd, &decoy, thd->mem_root, &not_used, 0) &&
+      !decoy.view)
+  {
+    return TRUE;
+  }
+  if (!lex->definer)
+  {
+    view->definer.host= decoy.definer.host;
+    view->definer.user= decoy.definer.user;
+    lex->definer= &view->definer;
+  }
+  if (lex->create_view_algorithm == VIEW_ALGORITHM_UNDEFINED)
+    lex->create_view_algorithm= decoy.algorithm;
+  if (lex->create_view_suid == VIEW_SUID_DEFAULT)
+    lex->create_view_suid= decoy.view_suid ? 
+      VIEW_SUID_DEFINER : VIEW_SUID_INVOKER;
+
+  return FALSE;
+}
+
 
 /*
   Creating/altering VIEW procedure
@@ -207,7 +255,15 @@ bool mysql_create_view(THD *thd,
   }
 
   if (mode != VIEW_CREATE_NEW)
+  {
+    if (mode == VIEW_ALTER &&
+        fill_defined_view_parts(thd, view))
+    {
+      res= TRUE;
+      goto err;
+    }
     sp_cache_invalidate();
+  }
 
   if (!lex->definer)
   {