Commit b91f3bac authored by unknown's avatar unknown
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
parents 45871dbf 4acf6de8

mysql-test/r/view.result

+11 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/view.test

+11 −0
Original line number Diff line number Diff line
@@ -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

#

sql/sql_lex.h

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ typedef struct st_lex : public Query_tables_list 
  /*

    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;

  /*

sql/sql_view.cc

+56 −0
Original line number Diff line number Diff line
@@ -155,6 +155,54 @@ bool check_duplicate_names(List<Item> &item_list, bool gen_unique_view_name) 
  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 @@ 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)

  {

sql/sql_yacc.yy

+3 −3
Original line number Diff line number Diff line
@@ -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: