From cf7b1241d12303df480fde5795ebe24c8e9c26d1 Mon Sep 17 00:00:00 2001
From: unknown <bell@sanja.is.com.ua>
Date: Wed, 17 Aug 2005 22:42:53 +0300
Subject: [PATCH] sql_view.cc:   correct exit from mysql_create_view to restore
 ennvironment (BUG#12468) view.result, view.test:   test of CRETE VIEW in SP

mysql-test/t/view.test:
  test of CRETE VIEW in SP
mysql-test/r/view.result:
  test of CRETE VIEW in SP
sql/sql_view.cc:
  correct exit from mysql_create_view to restore ennvironment
---
 mysql-test/r/view.result |  8 ++++++++
 mysql-test/t/view.test   | 12 ++++++++++++
 sql/sql_view.cc          | 21 ++++++++++++++++-----
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 2af2f06ad52..43df10b40dd 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -2097,3 +2097,11 @@ select * from v1;
 f1
 1
 drop view v1;
+create table t1(a int);
+create procedure p1() create view v1 as select * from t1;
+drop table t1;
+call p1();
+ERROR 42S02: Table 'test.t1' doesn't exist
+call p1();
+ERROR 42S02: Table 'test.t1' doesn't exist
+drop procedure p1;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index ceff7af401c..c185c9b1c86 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -1942,3 +1942,15 @@ DROP TABLE t1,t2,t3,t4,t5;
 create view v1 as select timestampdiff(day,'1997-01-01 00:00:00','1997-01-02 00:00:00') as f1;
 select * from v1;
 drop view v1;
+
+#
+# repeatable CREATE VIEW statement BUG#12468
+#
+create table t1(a int);
+create procedure p1() create view v1 as select * from t1;
+drop table t1;
+-- error 1146
+call p1();
+-- error 1146
+call p1();
+drop procedure p1;
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index c3222f951bb..1881cdc324f 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -234,7 +234,10 @@ bool mysql_create_view(THD *thd,
        (check_access(thd, DROP_ACL, view->db, &view->grant.privilege,
                      0, 0) ||
         grant_option && check_grant(thd, DROP_ACL, view, 0, 1, 0))))
-    DBUG_RETURN(TRUE);
+  {
+    res= TRUE;
+    goto err;
+  }
   for (sl= select_lex; sl; sl= sl->next_select())
   {
     for (tbl= sl->get_table_list(); tbl; tbl= tbl->next_local)
@@ -247,7 +250,8 @@ bool mysql_create_view(THD *thd,
       {
         my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
                  "ANY", thd->priv_user, thd->host_or_ip, tbl->table_name);
-        DBUG_RETURN(TRUE);
+        res= TRUE;
+        goto err;
       }
       /*
         Mark this table as a table which will be checked after the prepare
@@ -306,7 +310,10 @@ bool mysql_create_view(THD *thd,
 #endif
 
   if (open_and_lock_tables(thd, tables))
-    DBUG_RETURN(TRUE);
+  {
+    res= TRUE;
+    goto err;
+  }
 
   /*
     check that tables are not temporary  and this VIEW do not used in query
@@ -374,7 +381,10 @@ bool mysql_create_view(THD *thd,
   }
 
   if (check_duplicate_names(select_lex->item_list, 1))
-    DBUG_RETURN(TRUE);
+  {
+    res= TRUE;
+    goto err;
+  }
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   /*
@@ -404,7 +414,8 @@ bool mysql_create_view(THD *thd,
           my_error(ER_COLUMNACCESS_DENIED_ERROR, MYF(0),
                    "create view", thd->priv_user, thd->host_or_ip, item->name,
                    view->table_name);
-          DBUG_RETURN(TRUE);
+          res= TRUE;
+          goto err;
         }
       }
     }