bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:4572 to 4573) Bug#13067813

[Frazer Clement]

 4573 Frazer Clement	2011-10-06
      Bug#13067813 mysqlbinlog --database option broken

    modified:
      client/mysqlbinlog.cc
      mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test
 4572 Jonas Oreland	2011-10-05
      ndb - promote well behaving tests in daily-devel to daily-basic

    modified:
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/run-test/daily-devel-tests.txt
=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc	2011-06-30 15:59:25 +0000
+++ b/client/mysqlbinlog.cc	2011-10-06 14:43:17 +0000
@@ -900,6 +900,11 @@ Exit_status process_event(PRINT_EVENT_IN
     case WRITE_ROWS_EVENT:
     case DELETE_ROWS_EVENT:
     case UPDATE_ROWS_EVENT:
+#ifndef MCP_WL5353
+    case WRITE_ROWS_EVENT_V1:
+    case DELETE_ROWS_EVENT_V1:
+    case UPDATE_ROWS_EVENT_V1:
+#endif
     case PRE_GA_WRITE_ROWS_EVENT:
     case PRE_GA_DELETE_ROWS_EVENT:
     case PRE_GA_UPDATE_ROWS_EVENT:

=== modified file 'mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test'
--- a/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test	2009-09-30 02:31:25 +0000
+++ b/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test	2011-10-06 14:43:17 +0000
@@ -140,6 +140,17 @@ while($i)
     -- echo **** ERROR **** Database name 'b42941' NOT FOUND in mysqlbinlog output ($flags $outfile.2).
   }
 
+  #bug #13067813
+  if (`SELECT INSTR(@b42941_output.1, 'unknown table')`)
+  {
+    -- echo **** ERROR **** Table mapping failure detected
+  }
+
+  if (`SELECT INSTR(@b42941_output.2, 'unknown table')`)
+  {
+    -- echo **** ERROR **** Table mapping failure detected
+  }
+
   dec $i;
 }
 

No bundle (reason: useless for push emails).