diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-07-30 14:49:57 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-07-30 14:49:57 +0100 |
| commit | f7202b84cbcc8a644361f06e50188b0a07c5e909 (patch) | |
| tree | 5fcc9c3f4dc012b076f497a454ea59911a4a2538 /sql/sql_load.cc | |
| parent | a79187b8a6614c290e11f139de1d8217cd866255 (diff) | |
| parent | c8adc1d5e1753b99a2b94551c6d89db9dff52e24 (diff) | |
| download | mariadb-git-f7202b84cbcc8a644361f06e50188b0a07c5e909.tar.gz | |
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.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 15efa488173..d367c1c4fde 100644 --- a/sql/sql_load.cc +++ b/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 |