test of DELETE privilege and cyclic reference added in case of altering view (BUG#5148)

fixed ALTER VIEW syntax
fixed WITH CHECK OPTION clause printing in SHOW CREATE VIEW


mysql-test/r/view.result:
  test of VIEW altering
mysql-test/t/view.test:
  test of VIEW altering
sql/lex.h:
  explicitly mentioned undefined algorithm
sql/sql_show.cc:
  explicitly mentioned undefined algorithm
  added printing WITH CHECK OPTION clause
sql/sql_view.cc:
  test of DELETE privilege and cyclic reference added in case of altering view
  effective and requested WITH CHECK OPTION parameters divided
sql/sql_yacc.yy:
  fixed ALTER VIEW
sql/table.cc:
  effective and requested WITH CHECK OPTION parameters divided
sql/table.h:
  effective and requested WITH CHECK OPTION parameters divided

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/table.cc b/sql/table.cc
index 666effc75e7..bfe5395c3db 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1599,10 +1599,10 @@ bool st_table_list::setup_ancestor(THD *thd, Item **conds)
     if (arena)
       thd->set_n_backup_item_arena(arena, &backup);
 
-    if (with_check)
+    if (effective_with_check)
     {
       check_option= where->copy_andor_structure(thd);
-      if (with_check == VIEW_CHECK_CASCADED)
+      if (effective_with_check == VIEW_CHECK_CASCADED)
       {
         check_option= and_conds(check_option, ancestor->check_option);
       }