bk commit into 5.0 tree (SergeyV:1.2043)

[sergeyv]

Below is the list of changes that have just been committed into a local
5.0 repository of sergeyv. When sergeyv does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2043 06/02/27 16:52:14 SergeyV@selena. +1 -0
  Postfix for #15943. Explicit call of thd->clear_error() is added.

  sql/sql_show.cc
    1.309 06/02/27 16:52:05 SergeyV@selena. +2 -6
    Postfix for #15943. Explicit call of thd->clear_error() is added.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/#15943-mysql-5.0

--- 1.308/sql/sql_show.cc	2006-02-13 19:53:24 +03:00
+++ 1.309/sql/sql_show.cc	2006-02-27 16:52:05 +03:00
@@ -366,18 +366,14 @@
     if (!table_list->view || thd->net.last_errno != ER_VIEW_INVALID)
       DBUG_RETURN(TRUE);
 
-    /* 
-       Need this for proper processing of multiple sql statements        
-       sent as single command     
-    */    
-    thd->net.report_error= 0;
-
     /*
       Clear all messages with 'error' level status and
       issue a warning with 'warning' level status in 
       case of invalid view and last error is ER_VIEW_INVALID
     */
     mysql_reset_errors(thd, true);
+    thd->clear_error();
+
     push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN,
                         ER_VIEW_INVALID,
                         ER(ER_VIEW_INVALID),