bzr commit into mysql-5.1-telco-6.3 branch (frazer:3075) Bug#47323

[Frazer Clement]

#At file:///home/frazer/bzr/mysql-5.1-telco-6.3/

 3075 Frazer Clement	2009-09-29
      bug#47323 merge fix, as ndb_log_update* vars become visible in 6.3+, and DELETE logs all columns in 6.3+ when log_update_only=OFF
      modified:
        mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result

=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result	2009-09-29 14:25:03 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result	2009-09-29 15:26:43 +0000
@@ -5,6 +5,8 @@ delete from ba where ks=2;
 flush logs;
 show variables like '%log_update%';
 Variable_name	Value
+ndb_log_update_as_write	ON
+ndb_log_updated_only	ON
 sql_log_update	ON
 select txt from binlog_stmts where txt not like '%ndb_apply_status%' order by txt;
 txt
@@ -17,10 +19,12 @@ INSERT INTO test.ba SET   @1=4   @3=40
 flush logs;
 show variables like '%log_update%';
 Variable_name	Value
+ndb_log_update_as_write	ON
+ndb_log_updated_only	OFF
 sql_log_update	ON
 select txt from binlog_stmts where txt not like '%ndb_apply_status%' order by txt;
 txt
-DELETE FROM test.ba WHERE   @1=2
+DELETE FROM test.ba WHERE   @1=2   @2=2   @3=2
 INSERT INTO test.ba SET   @1=1   @2=1   @3=1
 INSERT INTO test.ba SET   @1=2   @2=2   @3=2
 INSERT INTO test.ba SET   @1=3   @2=3   @3=3
@@ -29,6 +33,8 @@ INSERT INTO test.ba SET   @1=4   @2=4   
 flush logs;
 show variables like '%log_update%';
 Variable_name	Value
+ndb_log_update_as_write	OFF
+ndb_log_updated_only	ON
 sql_log_update	ON
 select txt from binlog_stmts where txt not like '%ndb_apply_status%' order by txt;
 txt
@@ -41,10 +47,12 @@ UPDATE test.ba WHERE   @1=4   @3=4 SET  
 flush logs;
 show variables like '%log_update%';
 Variable_name	Value
+ndb_log_update_as_write	OFF
+ndb_log_updated_only	OFF
 sql_log_update	ON
 select txt from binlog_stmts where txt not like '%ndb_apply_status%' order by txt;
 txt
-DELETE FROM test.ba WHERE   @1=2
+DELETE FROM test.ba WHERE   @1=2   @2=2   @3=2
 INSERT INTO test.ba SET   @1=1   @2=1   @3=1
 INSERT INTO test.ba SET   @1=2   @2=2   @3=2
 INSERT INTO test.ba SET   @1=3   @2=3   @3=3