Commit 3212394a authored by unknown's avatar unknown
Browse files

grant.result: 

  manual merge


mysql-test/r/grant.result:
  manual merge
parent 20d0a277

mysql-test/r/grant.result

+2 −2
Original line number Diff line number Diff line
@@ -897,10 +897,10 @@ v_ny CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER 
SHOW CREATE VIEW  mysqltest2.v_ny;

View	Create View

v_ny	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `mysqltest2`.`v_ny` AS select `mysqltest2`.`t_nn`.`c1` AS `c1` from `mysqltest2`.`t_nn`

SHOW CREATE VIEW  mysqltest3.t_nn;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't_nn'

SHOW CREATE TABLE mysqltest3.t_nn;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't_nn'

SHOW CREATE VIEW  mysqltest3.t_nn;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't_nn'

SHOW CREATE VIEW  mysqltest3.v_nn;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'

SHOW CREATE TABLE mysqltest3.v_nn;