bzr push into mysql-5.1 branch (kgeorge:2773 to 2775)

[Georgi Kodinov]

 2775 Georgi Kodinov	2008-10-23 [merge]
      merged 5.0-5.1.29-rc -> 5.1-5.1.29-rc
modified:
  zlib/gzio.c

 2774 Georgi Kodinov	2008-10-23 [merge]
      merged 5.1-main to 5.1-5.1.29-rc
modified:
  configure.in
  sql/log.cc
  sql/sql_class.cc

 2773 Sven Sandberg	2008-10-22 [merge]
      Merged new test case for BUG#39812 to the head of 5.1
modified:
  mysql-test/r/binlog_format_basic.result
  mysql-test/t/binlog_format_basic.test

=== modified file 'configure.in'
--- a/configure.in	2008-10-09 12:46:03 +0000
+++ b/configure.in	2008-10-23 14:09:19 +0000
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.1.29)
+AM_INIT_AUTOMAKE(mysql, 5.1.30)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2008-10-08 09:15:00 +0000
+++ b/sql/log.cc	2008-10-21 12:18:38 +0000
@@ -3779,7 +3779,7 @@ THD::binlog_set_pending_rows_event(Rows_
 int
 MYSQL_BIN_LOG::remove_pending_rows_event(THD *thd)
 {
-  DBUG_ENTER(__FUNCTION__);
+  DBUG_ENTER("MYSQL_BIN_LOG::remove_pending_rows_event");
 
   binlog_trx_data *const trx_data=
     (binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2008-10-08 15:25:24 +0000
+++ b/sql/sql_class.cc	2008-10-21 12:18:38 +0000
@@ -3513,7 +3513,7 @@ int THD::binlog_delete_row(TABLE* table,
 
 int THD::binlog_remove_pending_rows_event(bool clear_maps)
 {
-  DBUG_ENTER(__FUNCTION__);
+  DBUG_ENTER("THD::binlog_remove_pending_rows_event");
 
   if (!mysql_bin_log.is_open())
     DBUG_RETURN(0);

=== modified file 'zlib/gzio.c'
--- a/zlib/gzio.c	2008-08-13 16:44:05 +0000
+++ b/zlib/gzio.c	2008-10-13 12:23:39 +0000
@@ -7,6 +7,11 @@
 
 /* @(#) $Id$ */
 
+/* Need to be included "early" to control other headers */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 
 #include "zutil.h"