bzr push into mysql-5.1 branch (hezx:2659 to 2660)

[He Zhenxing]

 2660 He Zhenxing	2008-08-15
      post fixes after merge
modified:
  mysql-test/suite/binlog/r/binlog_killed_simulate.result
  mysql-test/suite/rpl/r/rpl_stm_log.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test

 2659 He Zhenxing	2008-08-14 [merge]
      auto merge
modified:
  mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test

=== modified file 'mysql-test/suite/binlog/r/binlog_killed_simulate.result'
--- a/mysql-test/suite/binlog/r/binlog_killed_simulate.result	2008-08-14 09:38:22 +0000
+++ b/mysql-test/suite/binlog/r/binlog_killed_simulate.result	2008-08-15 02:31:04 +0000
@@ -19,7 +19,7 @@ ERROR 70100: Query execution was interru
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
-master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=#
+master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=#
 select
 (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
 is not null;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_log.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result	2008-08-14 09:38:22 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result	2008-08-15 02:31:04 +0000
@@ -194,7 +194,7 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	use `test`; drop table t1
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
 master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
-master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=#
+master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=#
 master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test	2008-04-25 22:17:34 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test	2008-08-15 02:31:04 +0000
@@ -172,7 +172,7 @@ SELECT COUNT(*), SUM(a), b FROM t1 WHERE
 --connection master
 DROP TABLE t1;
 --connection slave
---disable_warings
+--disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 --echo