bzr commit into mysql-5.1-telco-6.3 branch (tomas.ulin:2834)

[Tomas Ulin]

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

 2834 Tomas Ulin	2009-02-04 [merge]
      merge
added:
  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt
  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt
modified:
  mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result
  mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt
  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt
  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test
  sql/slave.cc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result	2009-01-08 10:52:44 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result	2009-02-03 14:35:26 +0000
@@ -924,4 +924,5 @@ DELETE FROM t1;
 --- End test 5 key partition testing ---
 --- Do Cleanup ---
 DROP TABLE IF EXISTS t1;
+set @@global.slave_exec_mode= 'STRICT';
 drop table mysql.ndb_apply_status;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result	2009-01-08 10:52:44 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result	2009-02-03 14:35:26 +0000
@@ -924,4 +924,5 @@ DELETE FROM t1;
 --- End test 5 key partition testing ---
 --- Do Cleanup ---
 DROP TABLE IF EXISTS t1;
+set @@global.slave_exec_mode= 'STRICT';
 drop table mysql.ndb_apply_status;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt	2008-01-04 14:42:26 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt	2009-02-03 14:35:26 +0000
@@ -1 +1 @@
---new --default-storage-engine=ndbcluster --ndb_log_updated_only=0 
+--new --ndb-log-updated-only=0 

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test	2009-02-03 13:35:56 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test	2009-02-04 08:24:56 +0000
@@ -36,7 +36,14 @@ CREATE TABLE mysql.ndb_apply_status
                    end_pos BIGINT UNSIGNED NOT NULL,
                    PRIMARY KEY USING HASH (server_id)) ENGINE=INNODB;
 
+-- connection master
+--disable_query_log
+set new=on;
+set storage_engine=ndbcluster;
+--enable_query_log
+
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test
 
 --connection slave
+set @@global.slave_exec_mode= 'STRICT';
 drop table mysql.ndb_apply_status;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt	2008-01-04 14:42:26 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt	2009-02-03 14:35:26 +0000
@@ -1 +1 @@
---new --default-storage-engine=ndbcluster --ndb_log_updated_only=0
+--ndb_log_updated_only=0

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test	2009-02-03 13:35:56 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test	2009-02-04 08:24:56 +0000
@@ -35,7 +35,14 @@ CREATE TABLE mysql.ndb_apply_status
                    end_pos BIGINT UNSIGNED NOT NULL,
                    PRIMARY KEY USING HASH (server_id)) ENGINE=MYISAM;
 
+-- connection master
+--disable_query_log
+set new=on;
+set storage_engine=ndbcluster;
+--enable_query_log
+
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test
 
 --connection slave
+set @@global.slave_exec_mode= 'STRICT';
 drop table mysql.ndb_apply_status;

=== added 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	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt	2009-02-04 08:03:04 +0000
@@ -0,0 +1 @@
+--new=true

=== added 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	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt	2009-02-04 08:03:04 +0000
@@ -0,0 +1 @@
+--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	2009-02-03 13:28:13 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test	2009-02-04 08:03:04 +0000
@@ -11,15 +11,7 @@
 
 --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

=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2009-01-19 10:49:56 +0000
+++ b/sql/slave.cc	2009-02-04 08:24:56 +0000
@@ -2839,11 +2839,15 @@ Slave SQL thread aborted. Can't execute 
 
   /* Read queries from the IO/THREAD until this thread is killed */
 
+  thd->variables.new_mode= global_system_variables.new_mode;
+
   while (!sql_slave_killed(thd,rli))
   {
     thd_proc_info(thd, "Reading event from the relay log");
     DBUG_ASSERT(rli->sql_thd == thd);
     THD_CHECK_SENTRY(thd);
+
+    sql_print_information("new_mode %u", thd->variables.new_mode);
     if (exec_relay_log_event(thd,rli))
     {
       DBUG_PRINT("info", ("exec_relay_log_event() failed"));