Commit 73d71a6c authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-afterbreak 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  ur
parents 4ab87172 f565eaf2

sql/sql_trigger.cc

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) 
      thd->clear_error();



      /* Such a statement can always go directly to binlog, no trans cache. */

      thd->binlog_query(THD::MYSQL_QUERY_TYPE,

      thd->binlog_query(THD::MYSQL_STMT_TYPE,

                        stmt_query.ptr(), stmt_query.length(), FALSE, FALSE);

    }

  }

sql/sql_view.cc

+14 −3
Original line number Diff line number Diff line
@@ -1417,6 +1417,7 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode) 
    query_cache_invalidate3(thd, view, 0);

    sp_cache_invalidate();

  }



  if (mysql_bin_log.is_open())

  {

    thd->clear_error();
@@ -1424,24 +1425,34 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode) 
                      thd->query, thd->query_length, FALSE, FALSE);

  }



  VOID(pthread_mutex_unlock(&LOCK_open));



  if (error)

  {

    VOID(pthread_mutex_unlock(&LOCK_open));

    DBUG_RETURN(TRUE);

  }

  if (wrong_object_name)

  {

    VOID(pthread_mutex_unlock(&LOCK_open));

    my_error(ER_WRONG_OBJECT, MYF(0), wrong_object_db, wrong_object_name, 

             "VIEW");

    DBUG_RETURN(TRUE);

  }

  if (non_existant_views.length())

  {

    VOID(pthread_mutex_unlock(&LOCK_open));

    my_error(ER_BAD_TABLE_ERROR, MYF(0), non_existant_views.c_ptr());

    DBUG_RETURN(TRUE);

  }



  if (mysql_bin_log.is_open())

  {

    thd->clear_error();

    thd->binlog_query(THD::STMT_QUERY_TYPE,

                      thd->query, thd->query_length, FALSE, FALSE);

  }



  send_ok(thd);

  VOID(pthread_mutex_unlock(&LOCK_open));

  DBUG_RETURN(FALSE);

}