summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@sun.com>2010-07-30 14:44:39 +0100
committerLuis Soares <luis.soares@sun.com>2010-07-30 14:44:39 +0100
commit55e60e14fa4eb240194412ee162c0394751da9e1 (patch)
tree93aa26118a006038439f1573871bdcdd106db3bf /sql/sql_load.cc
parent415fea54c5e6073ec5a40b465ba1d6eeb6032dd1 (diff)
downloadmariadb-git-55e60e14fa4eb240194412ee162c0394751da9e1.tar.gz
Revert patch for BUG#34283. Causing lots of test failures in PB2,
mostly because existing test result files were not updated.
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index f9386206dce..a4cf46b35e8 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -141,14 +141,6 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
bool transactional_table;
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
read_file_from_client = 0; //server is always in the same process
#endif