bzr push into mysql-5.1-telco-7.1 branch (Martin.Skold:4640 to 4641)

[Martin Skold]

 4641 Martin Skold	2012-11-01
      Added option to specify specific binlog_file to wait for, cleared variable after

    modified:
      mysql-test/include/wait_for_binlog_event.inc
 4640 Martin Skold	2012-11-01
      Bug#14615095  ERROR 839 'ILLEGAL NULL ATTRIBUTE' WHEN REPLAYING BINLOG: Added IgnoreError option when committing transactions during application of binlog statements to achieve same behavior as in the slave applier thread, added test cases

    modified:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result
      mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test
=== modified file 'mysql-test/include/wait_for_binlog_event.inc'
--- a/mysql-test/include/wait_for_binlog_event.inc	2012-11-01 14:54:48 +0000
+++ b/mysql-test/include/wait_for_binlog_event.inc	2012-11-01 17:04:09 +0000
@@ -46,3 +46,4 @@ while (`SELECT INSTR("$_last_event","$wa
     }
   }
 }
+let $binlog_file=;

No bundle (reason: useless for push emails).