diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 37a922cf103..8920efa87ab 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -366,18 +366,14 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
     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),