bzr push into mysql-5.1 branch (bar:2682 to 2683) Bug#31455

[Alexander Barkov]

 2683 Alexander Barkov	2008-08-22
      Additional fix for bug#31455.
      
      Exchanging "m_cols" and "m_cols_ai".
      
      Very confusing variable naming :(
modified:
  sql/log_event.cc

 2682 Alexander Barkov	2008-08-22
      Additional fix for bug#31455
      
      Removing server version with regex_replace
      to avoid non-determenistic test results.
modified:
  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_trans.test

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2008-08-21 11:47:23 +0000
+++ b/sql/log_event.cc	2008-08-22 05:17:52 +0000
@@ -1862,7 +1862,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;
@@ -1871,7 +1871,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;