Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.

Revert BUG#34283.

Conflicts
=========
  Text conflict in sql/sql_load.cc
  1 conflicts encountered.

mysql-test/suite/binlog/r/binlog_mixed_load_data.result

-RESET MASTER;
-CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=MYISAM;
-LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-DROP TABLE t1;

mysql-test/suite/binlog/t/binlog_mixed_load_data.test

-#
-# Bug #34283  mysqlbinlog leaves tmpfile after termination
-# if binlog contains load data infile, so in mixed mode we
-# go to row-based for avoiding the problem.
-#
-
---source include/have_binlog_format_mixed.inc
---source include/have_log_bin.inc
-
-RESET MASTER;
-CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=MYISAM;
-let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
-LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
---source include/show_binlog_events.inc
-DROP TABLE t1;

sql/sql_load.cc

@@ -189,14 +189,6 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   bool is_concurrent;
   DBUG_ENTER("mysql_load");
 
-  /*
-    Bug #34283
-    mysqlbinlog leaves tmpfile after termination if binlog contains
-    load data infile, so in mixed mode we go to row-based for
-    avoiding the problem.
-  */
-  thd->set_current_stmt_binlog_format_row_if_mixed();
-
 #ifdef EMBEDDED_LIBRARY
   read_file_from_client  = 0; //server is always in the same process 
 #endif