bzr push into mysql-5.1 branch (nirbhay.choubey:3669 to 3670) Bug#11760384

[Nirbhay Choubey]

 3670 Nirbhay Choubey	2012-01-17
      Bug #11760384 52792: MYSQLDUMP IN XML MODE DOES NOT
                           DUMP ROUTINES
      
      Minor post-fix to avoid build failure when built with
      Werror.

    modified:
      client/mysqldump.c
 3669 Marko Mäkelä	2012-01-16
      Bug#13496818 ASSERTION: REC_PAGE_NO > 4 IN IBUF CONTRACTION
      Relax a bogus debug assertion.
      Approved by Jimmy Yang on IM.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/ibuf/ibuf0ibuf.c
=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c	2012-01-10 08:03:45 +0000
+++ b/client/mysqldump.c	2012-01-17 03:40:58 +0000
@@ -1877,7 +1877,7 @@ static void print_xml_row(FILE *xml_file
 {
   uint i;
   my_bool body_found= 0;
-  char *create_stmt_ptr;
+  char *create_stmt_ptr= NULL;
   ulong create_stmt_len= 0;
   MYSQL_FIELD *field;
   ulong *lengths= mysql_fetch_lengths(tableRes);

No bundle (reason: useless for push emails).