MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:eugene Date:August 1 2006 4:52pm
Subject:bk commit into 5.1 tree (evgen:1.2253)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of evgen. When evgen 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-08-01 20:52:21+04:00, evgen@stripped +7 -0
  Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
  into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
  MERGE: 1.1810.1696.103

  client/mysql.cc@stripped, 2006-08-01 20:51:14+04:00, evgen@stripped +0 -0
    Auto merged
    MERGE: 1.199.1.11

  mysql-test/r/view.result@stripped, 2006-08-01 20:51:14+04:00, evgen@stripped +0 -0
    Auto merged
    MERGE: 1.138.1.31

  mysql-test/t/view.test@stripped, 2006-08-01 20:51:14+04:00, evgen@stripped +0 -0
    Auto merged
    MERGE: 1.126.1.28

  sql/sql_lex.h@stripped, 2006-08-01 20:51:15+04:00, evgen@stripped +0 -0
    Auto merged
    MERGE: 1.175.1.48

  sql/sql_view.cc@stripped, 2006-08-01 20:52:18+04:00, evgen@stripped +0 -0
    SCCS merged
    MERGE: 1.78.1.13

  sql/sql_yacc.yy@stripped, 2006-08-01 20:51:15+04:00, evgen@stripped +0 -0
    Auto merged
    MERGE: 1.371.1.105

  sql/table.h@stripped, 2006-08-01 20:51:15+04:00, evgen@stripped +0 -0
    Auto merged
    MERGE: 1.102.1.29

# 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:	evgen
# Host:	sunlight.local
# Root:	/local_work/tmp_merge-5.1-opt-mysql/RESYNC

--- 1.216/client/mysql.cc	2006-08-01 20:52:26 +04:00
+++ 1.217/client/mysql.cc	2006-08-01 20:52:26 +04:00
@@ -1230,7 +1230,8 @@
       continue;
     }
 #endif
-    if (!*ml_comment && inchar == '\\')
+    if (!*ml_comment && inchar == '\\' &&
+        !(mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES))
     {
       // Found possbile one character command like \c
 

--- 1.239/sql/sql_lex.h	2006-08-01 20:52:26 +04:00
+++ 1.240/sql/sql_lex.h	2006-08-01 20:52:26 +04:00
@@ -1047,7 +1047,7 @@
   /*
     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.490/sql/sql_yacc.yy	2006-08-01 20:52:26 +04:00
+++ 1.491/sql/sql_yacc.yy	2006-08-01 20:52:26 +04:00
@@ -10866,11 +10866,11 @@
 
 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.146/sql/table.h	2006-08-01 20:52:26 +04:00
+++ 1.147/sql/table.h	2006-08-01 20:52:26 +04:00
@@ -472,6 +472,10 @@
 #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.169/mysql-test/r/view.result	2006-08-01 20:52:26 +04:00
+++ 1.170/mysql-test/r/view.result	2006-08-01 20:52:26 +04:00
@@ -193,7 +193,7 @@
 2	5
 3	10
 drop view v100;
-ERROR 42S02: Unknown table 'test.v100'
+ERROR 42S02: Unknown table 'v100'
 drop view t1;
 ERROR HY000: 'test.t1' is not VIEW
 drop table v1;
@@ -2807,6 +2807,17 @@
 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;
@@ -2820,3 +2831,22 @@
 c
 DROP VIEW v1, v2;
 DROP TABLE t1;
+CREATE TABLE t1 (id INT);
+CREATE VIEW v1 AS SELECT id FROM t1;
+SHOW TABLES;
+Tables_in_test
+t1
+v1
+DROP VIEW v2,v1;
+ERROR 42S02: Unknown table 'v2'
+SHOW TABLES;
+Tables_in_test
+t1
+CREATE VIEW v1 AS SELECT id FROM t1;
+DROP VIEW t1,v1;
+ERROR HY000: 'test.t1' is not VIEW
+SHOW TABLES;
+Tables_in_test
+t1
+DROP TABLE t1;
+DROP VIEW IF EXISTS v1;

--- 1.152/mysql-test/t/view.test	2006-08-01 20:52:26 +04:00
+++ 1.153/mysql-test/t/view.test	2006-08-01 20:52:26 +04:00
@@ -2674,6 +2674,17 @@
 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
 #
@@ -2691,3 +2702,24 @@
 SELECT s1 FROM t1;
 DROP VIEW v1, v2;
 DROP TABLE t1;
+
+#
+# Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
+#
+CREATE TABLE t1 (id INT);
+CREATE VIEW v1 AS SELECT id FROM t1;
+SHOW TABLES;
+
+--error 1051
+DROP VIEW v2,v1;
+SHOW TABLES;
+
+CREATE VIEW v1 AS SELECT id FROM t1;
+--error 1347
+DROP VIEW t1,v1;
+SHOW TABLES;
+
+DROP TABLE t1;
+--disable_warnings
+DROP VIEW IF EXISTS v1;
+--enable_warnings

--- 1.96/sql/sql_view.cc	2006-08-01 20:52:26 +04:00
+++ 1.97/sql/sql_view.cc	2006-08-01 20:52:26 +04:00
@@ -155,6 +155,54 @@
   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 its 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 @@
   }
 
   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)
   {
@@ -1238,6 +1294,10 @@
 {
   char path[FN_REFLEN];
   TABLE_LIST *view;
+  frm_type_enum type;
+  String non_existant_views;
+  char *wrong_object_db= NULL, *wrong_object_name= NULL;
+  bool error= FALSE;
   enum legacy_db_type not_used;
   DBUG_ENTER("mysql_drop_view");
 
@@ -1248,8 +1308,9 @@
     build_table_filename(path, sizeof(path),
                          view->db, view->table_name, reg_ext);
     VOID(pthread_mutex_lock(&LOCK_open));
-    if (access(path, F_OK) ||
-	(type= (mysql_frm_type(thd, path, &not_used) != FRMTYPE_VIEW)))
+    type= FRMTYPE_ERROR;
+    if (access(path, F_OK) || 
+        FRMTYPE_VIEW != (type= mysql_frm_type(thd, path, &not_used)))
     {
       char name[FN_REFLEN];
       my_snprintf(name, sizeof(name), "%s.%s", view->db, view->table_name);
@@ -1261,14 +1322,25 @@
 	VOID(pthread_mutex_unlock(&LOCK_open));
 	continue;
       }
-      if (type)
-        my_error(ER_WRONG_OBJECT, MYF(0), view->db, view->table_name, "VIEW");
+      if (type == FRMTYPE_TABLE)
+      {
+        if (!wrong_object_name)
+        {
+          wrong_object_db= view->db;
+          wrong_object_name= view->table_name;
+        }
+      }
       else
-        my_error(ER_BAD_TABLE_ERROR, MYF(0), name);
-      goto err;
+      {
+        if (non_existant_views.length())
+          non_existant_views.append(',');
+        non_existant_views.append(String(view->table_name,system_charset_info));
+      }
+      VOID(pthread_mutex_unlock(&LOCK_open));
+      continue;
     }
     if (my_delete(path, MYF(MY_WME)))
-      goto err;
+      error= TRUE;
 
     /*
       For a view, there is only one table_share object which should never
@@ -1287,13 +1359,23 @@
     sp_cache_invalidate();
     VOID(pthread_mutex_unlock(&LOCK_open));
   }
+  if (error)
+  {
+    DBUG_RETURN(TRUE);
+  }
+  if (wrong_object_name)
+  {
+    my_error(ER_WRONG_OBJECT, MYF(0), wrong_object_db, wrong_object_name, 
+             "VIEW");
+    DBUG_RETURN(TRUE);
+  }
+  if (non_existant_views.length())
+  {
+    my_error(ER_BAD_TABLE_ERROR, MYF(0), non_existant_views.c_ptr());
+    DBUG_RETURN(TRUE);
+  }
   send_ok(thd);
   DBUG_RETURN(FALSE);
-
-err:
-  VOID(pthread_mutex_unlock(&LOCK_open));
-  DBUG_RETURN(TRUE);
-
 }
 
 
Thread
bk commit into 5.1 tree (evgen:1.2253)eugene1 Aug