bzr commit into mysql-5.1-telco-6.2-merge branch (tomas.ulin:2816)

[Tomas Ulin]

#At file:///home/tomas/mysql_src/mysql-5.1-telco-6.2-merge/

 2816 Tomas Ulin	2009-02-03
      remove some opt files not needed
removed:
  mysql-test/suite/ndb/t/ndb_partition_error2-master.opt
  mysql-test/suite/ndb/t/ndb_restore_partition-master.opt
  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt
  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt
  mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
modified:
  mysql-test/suite/ndb/t/ndb_restore_partition.test
  mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test
  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test

=== removed file 'mysql-test/suite/ndb/t/ndb_partition_error2-master.opt'
--- a/mysql-test/suite/ndb/t/ndb_partition_error2-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/ndb/t/ndb_partition_error2-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---ndbcluster

=== removed file 'mysql-test/suite/ndb/t/ndb_restore_partition-master.opt'
--- a/mysql-test/suite/ndb/t/ndb_restore_partition-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/ndb/t/ndb_restore_partition-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---new

=== modified file 'mysql-test/suite/ndb/t/ndb_restore_partition.test'
--- a/mysql-test/suite/ndb/t/ndb_restore_partition.test	2007-07-04 20:38:53 +0000
+++ b/mysql-test/suite/ndb/t/ndb_restore_partition.test	2009-02-03 13:28:13 +0000
@@ -2,6 +2,10 @@
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 
+--disable_query_log
+set new=on;
+--enable_query_log
+
 --disable_warnings
 use test;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test	2008-10-04 18:49:45 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test	2009-02-03 13:28:13 +0000
@@ -16,7 +16,7 @@ select * from mysql.ndb_apply_status;
 
 
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 
 #

=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt	2007-08-21 14:26:00 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---new=true

=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt	2007-08-21 14:26:00 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---new=true

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test	2007-07-25 13:40:43 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test	2009-02-03 13:28:13 +0000
@@ -11,7 +11,15 @@
 
 --echo --- Doing pre test cleanup --- 
 
+connection slave;
+--disable_query_log
+set new=on;
+--enable_query_log
+
 connection master;
+--disable_query_log
+set new=on;
+--enable_query_log
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_query_log

=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt'
--- a/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt	2008-09-15 19:13:43 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---binlog-format=mixed