bzr push into mysql-6.0-wl2110-review branch (marc.alff:2720 to 2721)

[Marc Alff]

 2721 Marc Alff	2008-12-11
      Resolve merge issues affecting backup
modified:
  sql/si_objects.cc
  sql/sql_class.cc
  sql/sql_prepare.cc

 2720 Marc Alff	2008-12-11
      Merge cleanup
modified:
  sql/protocol.cc
  sql/si_objects.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_error.cc
  sql/sql_prepare.cc
  sql/sql_view.cc

=== modified file 'sql/si_objects.cc'
--- a/sql/si_objects.cc	2008-12-12 02:06:47 +0000
+++ b/sql/si_objects.cc	2008-12-12 05:54:54 +0000
@@ -213,9 +213,11 @@ void copy_warnings(THD *thd, List<SQL_co
 
   while ((cond= cond_it++))
   {
-    DBUG_ASSERT(cond->get_level() != MYSQL_ERROR::WARN_LEVEL_ERROR);
-    push_warning(thd, cond->get_level(),
-                 cond->get_sql_errno(), cond->get_message_text());
+    thd->warning_info->raise_condition(thd,
+                                       cond->get_sql_errno(),
+                                       cond->get_sqlstate(),
+                                       cond->get_level(),
+                                       cond->get_message_text());
   }
 }
 

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2008-12-12 02:06:47 +0000
+++ b/sql/sql_class.cc	2008-12-12 05:54:54 +0000
@@ -789,7 +789,6 @@ SQL_condition* THD::raise_condition(uint
     {
       if (! stmt_da->is_error())
         stmt_da->set_error_status(this, sql_errno, msg, sqlstate);
-      query_cache_abort(& query_cache_tls);
     }
   }
 
@@ -822,6 +821,8 @@ THD::raise_condition_no_handler(uint sql
   SQL_condition *cond= NULL;
   DBUG_ENTER("THD::raise_condition_no_handler");
 
+  query_cache_abort(& query_cache_tls);
+
   /* FIXME: broken special case */
   if (no_warnings_for_error && (level == MYSQL_ERROR::WARN_LEVEL_ERROR))
     DBUG_RETURN(NULL);

=== modified file 'sql/sql_prepare.cc'
--- a/sql/sql_prepare.cc	2008-12-12 02:06:47 +0000
+++ b/sql/sql_prepare.cc	2008-12-12 05:54:54 +0000
@@ -241,7 +241,7 @@ protected:
                        const char *message);
 
   virtual void send_eof(uint server_status, uint statement_warn_count);
-  virtual void send_error(uint sql_errno, const char *err_msg);
+  virtual void send_error(uint sql_errno, const char *err_msg, const char* sqlstate);
 private:
   bool store_string(const char *str, size_t length,
                     CHARSET_INFO *src_cs, CHARSET_INFO *dst_cs);
@@ -4384,7 +4384,7 @@ void Protocol_local::send_eof(uint serve
 /** Called to send an error to the client at the end of a statement. */
 
 void
-Protocol_local::send_error(uint sql_errno, const char *err_msg)
+Protocol_local::send_error(uint sql_errno, const char *err_msg, const char*)
 {
   /*
     Just make sure that nothing is sent to the client (default