bk commit into 5.1 tree (kostja:1.2573)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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@stripped, 2007-08-16 21:14:47+04:00, kostja@bodhi.(none) +4 -0
  Fix doxygen warnings.

  include/mysql/plugin.h@stripped, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings.

  sql/field.h@stripped, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +6 -1
    Fix doxygen warnings - too complex return value type, it choked on it.

  sql/field_conv.cc@stripped, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +2 -1
    Fix doxygen warnings - too complex return value type, it choked on it.

  sql/log_event.h@stripped, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +2 -2
    Fix doxygen warnings.

diff -Nrup a/include/mysql/plugin.h b/include/mysql/plugin.h
--- a/include/mysql/plugin.h	2007-08-16 19:52:52 +04:00
+++ b/include/mysql/plugin.h	2007-08-16 21:14:41 +04:00
@@ -773,7 +773,7 @@ void thd_get_xid(const MYSQL_THD thd, MY
   Invalidate the query cache for a given table.
 
   @param thd         user thread connection handle
-  @param key         databasename\0tablename\0
+  @param key         databasename\\0tablename\\0
   @param key_length  length of key in bytes, including the NUL bytes
   @param using_trx   flag: TRUE if using transactions, FALSE otherwise
 */
diff -Nrup a/sql/field.h b/sql/field.h
--- a/sql/field.h	2007-08-04 13:08:07 +04:00
+++ b/sql/field.h	2007-08-16 21:14:41 +04:00
@@ -1732,7 +1732,12 @@ class Send_field {
 */
 
 class Copy_field :public Sql_alloc {
-  void (*get_copy_func(Field *to,Field *from))(Copy_field *);
+  /**
+    Convenience definition of a copy function returned by
+    get_copy_func.
+  */
+  typedef void Copy_func(Copy_field*);
+  Copy_func *get_copy_func(Field *to, Field *from);
 public:
   uchar *from_ptr,*to_ptr;
   uchar *from_null_ptr,*to_null_ptr;
diff -Nrup a/sql/field_conv.cc b/sql/field_conv.cc
--- a/sql/field_conv.cc	2007-07-13 18:36:08 +04:00
+++ b/sql/field_conv.cc	2007-08-16 21:14:41 +04:00
@@ -620,7 +620,8 @@ void Copy_field::set(Field *to,Field *fr
 }
 
 
-void (*Copy_field::get_copy_func(Field *to,Field *from))(Copy_field*)
+Copy_field::Copy_func *
+Copy_field::get_copy_func(Field *to,Field *from)
 {
   bool compatible_db_low_byte_first= (to->table->s->db_low_byte_first ==
                                      from->table->s->db_low_byte_first);
diff -Nrup a/sql/log_event.h b/sql/log_event.h
--- a/sql/log_event.h	2007-08-16 19:52:52 +04:00
+++ b/sql/log_event.h	2007-08-16 21:14:41 +04:00
@@ -435,7 +435,7 @@ struct sql_ex_info
   ((ULL(1) << 14) | (ULL(1) << 26) | (ULL(1) << 27) | (ULL(1) << 19))
 
 #if OPTIONS_WRITTEN_TO_BIN_LOG != EXPECTED_OPTIONS
-#error 1
+#error
 #endif
 #undef EXPECTED_OPTIONS         /* You shouldn't use this one */
 
@@ -2549,7 +2549,7 @@ protected:
    <caption>Incident event format</caption>
    <tr>
      <th>Symbol</th>
-     <th>Size<br/>(bytes)</th>
+     <th>Size<br>(bytes)</th>
      <th>Description</th>
    </tr>
    <tr>