From: Tor Didriksen
Date: October 29 2010 10:52am
Subject: bzr commit into mysql-trunk-bugfixing branch (tor.didriksen:3303)
List-Archive: http://lists.mysql.com/commits/122293
Message-Id: <20101029105243.5EB9D37CE@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///export/home/didrik/repo/trunk-bugfixing-br1/ based on revid:georgi.kodinov@stripped

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

    modified:
      sql/field.cc
=== 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: revision is a merge).