From 84b16f0e66506c4fba1ed4acea932a56e206a86c Mon Sep 17 00:00:00 2001
From: unknown <evgen@sunlight.local>
Date: Wed, 2 Aug 2006 00:38:38 +0400
Subject: [PATCH] sql_view.cc:   After merge fix

sql/sql_view.cc:
  After merge fix
---
 sql/sql_view.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 546d940e3a4..09a199b2738 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -1304,11 +1304,11 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
   for (view= views; view; view= view->next_local)
   {
     TABLE_SHARE *share;
-    bool type= 0;
+    frm_type_enum type= FRMTYPE_ERROR;
     build_table_filename(path, sizeof(path),
                          view->db, view->table_name, reg_ext);
     VOID(pthread_mutex_lock(&LOCK_open));
-    type= FRMTYPE_ERROR;
+
     if (access(path, F_OK) || 
         FRMTYPE_VIEW != (type= mysql_frm_type(thd, path, &not_used)))
     {