From: Tor Didriksen
Date: October 25 2010 3:17pm
Subject: bzr push into mysql-trunk-merge branch (tor.didriksen:3297 to 3298)
List-Archive: http://lists.mysql.com/commits/121835
Message-Id: <20101025151723.7EACA3723@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3298 Tor Didriksen	2010-10-25 [merge]
      Auto-merge from 5.5-bugteam

    modified:
      sql/sql_lex.h
 3297 Tor Didriksen	2010-10-25
      Fix broken build on solaris/dbg
      only identifiers with external linkage may have linker scoping: dict_lru_validate
     @ storage/innobase/dict/dict0dict.c
        Use the same storage class for declaration and definition of functions.

    modified:
      storage/innobase/dict/dict0dict.c
=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2010-10-07 12:47:15 +0000
+++ b/sql/sql_lex.h	2010-10-25 15:15:37 +0000
@@ -1401,6 +1401,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)
@@ -1434,7 +1435,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).