bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3211)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@stripped1wudz

 3211 Magnus Blåudd	2011-02-15
      ndb
       - update .test file to only include "ndb_log_update%" variables in show
       - fix .result file for the above and also that sql_log_update is now removed
        (it should not have been in the .result file in the first place)

    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/suite/ndb_binlog/r/ndb_binlog_variants.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result	2009-10-07 17:16:52 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result	2011-02-15 10:38:28 +0000
@@ -7,11 +7,10 @@ flush logs;
 flush logs;
 flush logs;
 delete from ba;
-show variables like '%log_update%';
+show variables like 'ndb_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
 DELETE FROM test.ba WHERE   @1=2
@@ -26,11 +25,10 @@ ks	st	lp
 3	3	3
 4	4	40
 delete from ba;
-show variables like '%log_update%';
+show variables like 'ndb_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   @2=2   @3=2
@@ -45,11 +43,10 @@ ks	st	lp
 3	3	3
 4	4	40
 delete from ba;
-show variables like '%log_update%';
+show variables like 'ndb_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
 DELETE FROM test.ba WHERE   @1=2
@@ -64,11 +61,10 @@ ks	st	lp
 3	3	3
 4	4	40
 delete from ba;
-show variables like '%log_update%';
+show variables like 'ndb_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   @2=2   @3=2
@@ -84,11 +80,10 @@ ks	st	lp
 4	4	40
 drop table ba;
 reset master;
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 Variable_name	Value
 ndb_log_update_as_write	ON
 ndb_log_updated_only	ON
-sql_log_update	ON
 create table bah (tst int primary key, cvy int, sqs int, unique(sqs)) engine=ndb;
 insert into bah values (1,1,1);
 update bah set cvy= 2 where tst=1;

=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test	2010-12-14 19:28:08 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test	2011-02-15 10:38:28 +0000
@@ -97,7 +97,7 @@ delete from ba;
 
 connection mysqld1;
 
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 --source suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc
 
 --disable_query_log
@@ -111,7 +111,7 @@ delete from ba;
 
 connection mysqld2;
 
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 --source suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc
 
 --disable_query_log
@@ -126,7 +126,7 @@ delete from ba;
 
 connection mysqld3;
 
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 --source suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc
 
 --disable_query_log
@@ -140,7 +140,7 @@ delete from ba;
 
 connection mysqld4;
 
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 --source suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc
 
 --disable_query_log
@@ -175,7 +175,7 @@ flush logs;
 
 connection mysqld1;
 reset master;
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 
 create table bah (tst int primary key, cvy int, sqs int, unique(sqs)) engine=ndb;
 

Attachment: [text/bzr-bundle] bzr/[e-mail]