Merge zim.(none):/home/brian/mysql/mysql-5.0

into  zim.(none):/home/brian/mysql/mysql-5.1

Resolved to minor issues. 


BitKeeper/etc/config:
  Auto merged
Makefile.am:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
configure.in:
  Fixed the resolve of versions.
mysql-test/r/alter_table.result:
  Fixed results.

1 files changed, 16 insertions, 5 deletions

diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index dcada0c0780..8269c16916a 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -230,7 +230,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)
@@ -243,7 +246,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
@@ -302,7 +306,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
@@ -372,7 +379,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
   /*
@@ -402,7 +412,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;
         }
       }
     }