bzr push into mysql-next-mr-bugfixing branch (guilhem:3194 to 3195)

[Guilhem Bichot]

 3195 Guilhem Bichot	2010-08-09
      fix for simple test failures. Some tests set the "debug" variable but are expected
      to pass even if this variable doesn't exist; but for a binary which has debug_sync
      compiled in and not debug, setting debug will try to set ("prefix rule")
      debug-sync-timeout and this will fail. Solution: made tests require debug binary.

    modified:
      mysql-test/r/ctype_utf8mb4_ndb.result
      mysql-test/suite/rpl/t/rpl_bug38694.test
      mysql-test/suite/rpl/t/rpl_temporary_errors.test
      mysql-test/t/partition_debug_sync.test
 3194 Alfranio Correia	2010-08-08 [merge]
      merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing

    modified:
      mysql-test/extra/rpl_tests/create_recursive_construct.inc
      mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
      mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
      sql/binlog.cc
      sql/log_event.cc
      sql/sp_head.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
=== modified file 'mysql-test/r/ctype_utf8mb4_ndb.result'
--- a/mysql-test/r/ctype_utf8mb4_ndb.result	2010-05-05 13:35:35 +0000
+++ b/mysql-test/r/ctype_utf8mb4_ndb.result	2010-08-09 11:28:03 +0000
@@ -1106,7 +1106,7 @@ explain
 select substr(Z.a,-1), Z.a from t1 as Y join t1 as Z on Y.a=Z.a order by 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	Y	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
-1	SIMPLE	Z	ALL	NULL	NULL	NULL	NULL	2	Using where; Using join buffer
+1	SIMPLE	Z	ALL	NULL	NULL	NULL	NULL	2	Using where; Using join buffer (BNL, regular buffers)
 select substr(Z.a,-1), Z.a from t1 as Y join t1 as Z on Y.a=Z.a order by 1;
 substr(Z.a,-1)	a
 3	123

=== modified file 'mysql-test/suite/rpl/t/rpl_bug38694.test'
--- a/mysql-test/suite/rpl/t/rpl_bug38694.test	2009-04-30 13:20:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug38694.test	2010-08-09 11:28:03 +0000
@@ -5,6 +5,7 @@
 # DBUG_EXECUTE_IF("simulate_slave_delay_at_terminate_bug38694", sleep(5););
 # could cause any issue.
 
+source include/have_debug.inc;
 source include/master-slave.inc;
 
 # End of tests

=== modified file 'mysql-test/suite/rpl/t/rpl_temporary_errors.test'
--- a/mysql-test/suite/rpl/t/rpl_temporary_errors.test	2010-07-16 21:00:50 +0000
+++ b/mysql-test/suite/rpl/t/rpl_temporary_errors.test	2010-08-09 11:28:03 +0000
@@ -1,3 +1,4 @@
+source include/have_debug.inc;
 source include/have_binlog_format_row.inc;
 source include/master-slave.inc;
 

=== modified file 'mysql-test/t/partition_debug_sync.test'
--- a/mysql-test/t/partition_debug_sync.test	2010-07-01 13:53:46 +0000
+++ b/mysql-test/t/partition_debug_sync.test	2010-08-09 11:28:03 +0000
@@ -5,6 +5,7 @@
 #
 --source include/have_partition.inc
 --source include/have_debug_sync.inc
+--source include/have_debug.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1, t2;


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