commit into mysql-6.0 branch (aelkin:2658) Bug#36968

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/6.0-bug36968-rpl_temporary_errors_warn/

 2658 Andrei Elkin	2008-06-13
      Bug #36968 rpl_temporary_errors.test produces warning in pushbuild
      
      the 2nd patch merely adds comments for two files.
modified:
  sql/log.cc
  sql/sql_error.h

per-file comments:
  sql/log.cc
    added comments
  sql/sql_error.h
    added comments
=== modified file 'sql/log.cc'
--- a/sql/log.cc	2008-06-10 22:27:52 +0000
+++ b/sql/log.cc	2008-06-13 20:08:27 +0000
@@ -97,7 +97,13 @@
   return TRUE;
 }
 
+/*
+  Array of warning report functions.
+  The functions are listed in the order defined by
+  MYSQL_ERROR::enum_warning_level.
 
+  @todo: merge the array with MYSQL_ERROR class
+*/
 sql_print_message_func sql_print_message_handlers[3] =
 {
   sql_print_information,

=== modified file 'sql/sql_error.h'
--- a/sql/sql_error.h	2007-06-07 08:53:23 +0000
+++ b/sql/sql_error.h	2008-06-13 20:08:27 +0000
@@ -16,6 +16,12 @@
 class MYSQL_ERROR: public Sql_alloc
 {
 public:
+  /*
+    Enumeration value describing the severity of the error.
+
+    Note that these enumeration values must correspond to the indices
+    of the sql_print_message_handlers array.
+  */
   enum enum_warning_level
   { WARN_LEVEL_NOTE, WARN_LEVEL_WARN, WARN_LEVEL_ERROR, WARN_LEVEL_END};