1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert patch for BUG#34283. Causing lots of test failures in PB2,

Browse Source 
mostly because existing test result files were not updated.
This commit is contained in:
Luis Soares 2010-07-30 14:44:39 +01:00
parent 415fea54c5
commit 55e60e14fa
3 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/binlog/r/binlog_mixed_load_data.result
View File

@ -1,10 +0,0 @@
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;

15
mysql-test/suite/binlog/t/binlog_mixed_load_data.test
View File

@ -1,15 +0,0 @@
#
# 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;

8
sql/sql_load.cc
View File

@ -141,14 +141,6 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
bool transactional_table; bool transactional_table;
DBUG_ENTER("mysql_load"); 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_row_based_if_mixed();
#ifdef EMBEDDED_LIBRARY #ifdef EMBEDDED_LIBRARY
read_file_from_client = 0; //server is always in the same process read_file_from_client = 0; //server is always in the same process
#endif #endif