diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:29:04 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:29:04 +0200 |
| commit | 5139bf6c8f2cde4b598aa0e822f126936346f914 (patch) | |
| tree | b38d061771d52ab55fe9d428e45627d4c08d5f63 /sql/sql_load.cc | |
| parent | bd75361929caadac565d471d7e374060ff93794d (diff) | |
| parent | 8977575cff0ed295692e866b1cd543bdf49c0a20 (diff) | |
| download | mariadb-git-5139bf6c8f2cde4b598aa0e822f126936346f914.tar.gz | |
Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index d367c1c4fde..15efa488173 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -189,6 +189,14 @@ 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 |