bzr push into mysql-trunk-bugfixing branch (tor.didriksen:3302 to 3303)

[Tor Didriksen]

 3303 Tor Didriksen	2010-10-29 [merge]
      Merge from 5.5-bugteam

    modified:
      sql/field.cc
 3302 Georgi Kodinov	2010-10-29 [merge]
      merge

    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:17:28 +0000
+++ b/sql/field.cc	2010-10-29 10:52:30 +0000
@@ -8431,6 +8431,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,
@@ -8453,6 +8455,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).