bzr push into mysql-trunk branch (davi:3206 to 3207)

[Davi Arnaut]

 3207 Davi Arnaut	2011-06-15
      Revert changes that were improperly pushed.

    modified:
      sql/sql_error.h
 3206 Davi Arnaut	2011-06-15
      Revert making const MYSQL_ERROR objects useable.

    modified:
      sql/event_scheduler.cc
      sql/log_event.cc
      sql/rpl_slave.cc
      sql/sp_head.cc
      sql/sql_admin.cc
      sql/sql_base.cc
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_plist.h
      sql/sql_prepare.h
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_test.cc
      sql/table.cc
      sql/table.h
=== modified file 'sql/sql_error.h'
--- a/sql/sql_error.h	2011-06-15 17:01:24 +0000
+++ b/sql/sql_error.h	2011-06-15 19:00:26 +0000
@@ -544,12 +544,10 @@ private:
 ///////////////////////////////////////////////////////////////////////////
 
 
-void raise_warning(THD *thd, uint code, const char *msg, uint flags);
-void raise_warning_printf(THD *thd,
-                          uint code,
-                          const char *format,
-                          uint flags, ...) ATTRIBUTE_FORMAT(3, 4);
-
+void push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
+                  uint code, const char *msg);
+void push_warning_printf(THD *thd, MYSQL_ERROR::enum_warning_level level,
+                         uint code, const char *format, ...);
 bool mysqld_show_warnings(THD *thd, ulong levels_to_show);
 uint32 convert_error_message(char *to, uint32 to_length,
                              const CHARSET_INFO *to_cs,

No bundle (reason: useless for push emails).