database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge dl145j.mysql.com:/tmp/andrei/mysql-5.0-rpl

Browse Source 
into  dl145j.mysql.com:/tmp/andrei/5.1-merge
This commit is contained in:
aelkin@dl145j.mysql.com
2007-09-15 21:25:56 +02:00
parent 17f804f8d3 341e484f77
commit 1a0fea60a3
7 changed files with 337 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_load.cc
View File

@ -445,7 +445,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
/* If the file was not empty, wrote_create_file is true */
if (lf_info.wrote_create_file)
{
if ((info.copied || info.deleted) && !transactional_table)
if (thd->transaction.stmt.modified_non_trans_table)
write_execute_load_query_log_event(thd, handle_duplicates,
ignore, transactional_table);
else