Merge mysql.com:/home/mysql_src/mysql-5.0

into  mysql.com:/home/mysql_src/mysql-5.1-new


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

@@ -283,3 +283,4 @@ is not null;
 eval select
 @a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",
 @a not like "%#%error_code=%error_code=%";
+drop table t1, t2;

mysql-test/r/binlog_stm_mix_innodb_myisam.result

@@ -279,3 +279,4 @@ select
 @a not like "%#%error_code=%error_code=%";
 @a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"
 1	1
+drop table t1, t2;