bzr push into mysql-5.5-bugteam branch (tor.didriksen:3106 to 3107) Bug#52131

[Tor Didriksen]

 3107 Tor Didriksen	2010-10-29
      Bug #52131: SET and ENUM stored endian-dependent in binary log
      Post-Push fix, DBUG build broken on freebsd7
      
      sql/field.cc:8456: warning: control reaches end of non-void function
     @ sql/field.cc
        Return NULL to keep compiler happy.

    modified:
      sql/field.cc
 3106 Georgi Kodinov	2010-10-27
      Bug #57774: Typos/ambiguities in the WL1054 comments
      
      Fixed few typos and added better wording as suggested.

    modified:
      include/mysql/plugin_auth.h
      plugin/auth/dialog.c
      plugin/auth/test_plugin.c
=== modified file 'sql/field.cc'
--- a/sql/field.cc	2010-10-27 21:12:45 +0000
+++ b/sql/field.cc	2010-10-29 09:35:07 +0000
@@ -8408,6 +8408,8 @@ uchar *Field_enum::pack(uchar *to, const
   default:
     DBUG_ASSERT(0);
   }
+  MY_ASSERT_UNREACHABLE();
+  DBUG_RETURN(NULL);
 }
 
 const uchar *Field_enum::unpack(uchar *to, const uchar *from,
@@ -8430,6 +8432,8 @@ const uchar *Field_enum::unpack(uchar *t
   default:
     DBUG_ASSERT(0);
   }
+  MY_ASSERT_UNREACHABLE();
+  DBUG_RETURN(NULL);
 }
 
 

No bundle (reason: useless for push emails).