1 files changed, 9 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 1b7f690259a..a909335bfa7 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -141,6 +141,14 @@ 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
@@ -1139,7 +1147,7 @@ READ_INFO::~READ_INFO()
     if (need_end_io_cache)
       ::end_io_cache(&cache);
   }
-  my_free((uchar*) buffer,MYF(MY_ALLOW_ZERO_PTR));
+  my_free(buffer, MYF(MY_ALLOW_ZERO_PTR));
 }