bzr push into mysql-6.0 branch (bar:2775 to 2776)

[Alexander Barkov]

 2776 Alexander Barkov	2008-08-22 [merge]
      Merging from 5.1-rpl-testfixes
modified:
  sql/log_event.cc

 2775 Alexander Barkov	2008-08-22 [merge]
      Bug#31455
      - Merging from 5.1
      - Fixing is_null handling in Rows_log_event::print_verbose_one_row().
modified:
  client/mysqlbinlog.cc
  mysql-test/include/mysqlbinlog_row_engine.inc
  mysql-test/r/mysqlbinlog_row.result
  mysql-test/r/mysqlbinlog_row_innodb.result
  mysql-test/r/mysqlbinlog_row_myisam.result
  mysql-test/r/mysqlbinlog_row_trans.result
  mysql-test/t/mysqlbinlog_row.test
  mysql-test/t/mysqlbinlog_row_big.test
  mysql-test/t/mysqlbinlog_row_trans.test
  sql/log_event.cc
  sql/log_event.h
  sql/mysql_priv.h
  sql/sql_base.cc
  sql/sql_repl.cc

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2008-08-22 06:48:55 +0000
+++ b/sql/log_event.cc	2008-08-22 09:29:09 +0000
@@ -1865,7 +1865,7 @@ void Rows_log_event::print_verbose(IO_CA
                       map->get_db_name(), map->get_table_name());
     /* Print the first image */
     if (!(length= print_verbose_one_row(file, td, print_event_info,
-                                  &m_cols_ai, value,
+                                  &m_cols, value,
                                   (const uchar*) sql_clause1)))
       goto end;
     value+= length;
@@ -1874,7 +1874,7 @@ void Rows_log_event::print_verbose(IO_CA
     if (sql_clause2)
     {
       if (!(length= print_verbose_one_row(file, td, print_event_info,
-                                      &m_cols, value,
+                                      &m_cols_ai, value,
                                       (const uchar*) sql_clause2)))
         goto end;
       value+= length;