From: Tor Didriksen
Date: October 25 2010 3:17pm
Subject: bzr push into mysql-5.5-bugteam branch (tor.didriksen:3268 to 3269) Bug#45288
List-Archive: http://lists.mysql.com/commits/121836
X-Bug: 45288
Message-Id: <20101025151758.0F9F23723@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3269 Tor Didriksen	2010-10-25
      Bug#45288: pb2 returns a lot of compilation warnings
      
      sql/sql_lex.h:1437: warning: control reaches end of non-void function
     @ sql/sql_lex.h
        Make compiler happy, by adding a return statement.

    modified:
      sql/sql_lex.h
 3268 Horst.Hunger	2010-10-25
      Due to failing on Freebsd.

    modified:
      mysql-test/r/plugin_auth_qa_2.result
      mysql-test/t/plugin_auth_qa_1.test
      mysql-test/t/plugin_auth_qa_2.test
=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2010-10-06 14:34:28 +0000
+++ b/sql/sql_lex.h	2010-10-25 15:08:27 +0000
@@ -1389,6 +1389,7 @@ public:
     STMT_ACCESS_TABLE_COUNT
   };
 
+#ifndef DBUG_OFF
   static inline const char *stmt_accessed_table_string(enum_stmt_accessed_table accessed_table)
   {
     switch (accessed_table)
@@ -1422,7 +1423,10 @@ public:
         DBUG_ASSERT(0);
       break;
     }
+    MY_ASSERT_UNREACHABLE();
+    return "";
   }
+#endif  /* DBUG */
                
   #define BINLOG_DIRECT_ON 0xF0    /* unsafe when
                                       --binlog-direct-non-trans-updates

No bundle (reason: useless for push emails).