From: Tor Didriksen
Date: February 16 2011 2:01pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:3654 to 3655)
List-Archive: http://lists.mysql.com/commits/131435
Message-Id: <20110216140146.3F1343780@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3655 Tor Didriksen	2011-02-16 [merge]
      merge 5.5 => trunk

    modified:
      extra/comp_err.c
 3654 Tor Didriksen	2011-02-16 [merge]
      merge 5.5 => trunk

    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/t/file_contents.test
=== modified file 'extra/comp_err.c'
--- a/extra/comp_err.c	2010-11-05 22:14:29 +0000
+++ b/extra/comp_err.c	2011-02-16 13:49:26 +0000
@@ -219,14 +219,13 @@ static void print_escaped_string(FILE *f
 
 static int create_header_files(struct errors *error_head)
 {
-  uint er_last;
+  uint er_last= 0;
   FILE *er_definef, *sql_statef, *er_namef;
   struct errors *tmp_error;
   struct message *er_msg;
   const char *er_text;
 
   DBUG_ENTER("create_header_files");
-  LINT_INIT(er_last);
 
   if (!(er_definef= my_fopen(HEADERFILE, O_WRONLY, MYF(MY_WME))))
   {

No bundle (reason: useless for push emails).