database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc

Browse Source
This commit is contained in:
Marc Alff
2009-12-11 01:58:13 -07:00
parent c082955f06 376cf4275f
commit bea4ab9bb6
222 changed files with 84843 additions and 150496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_delete.cc
View File

@@ -849,9 +849,10 @@ void multi_delete::abort()
if (mysql_bin_log.is_open())
{
int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED);
thd->binlog_query(THD::ROW_QUERY_TYPE,
thd->query(), thd->query_length(),
transactional_tables, FALSE, errcode);
/* possible error of writing binary log is ignored deliberately */
(void) thd->binlog_query(THD::ROW_QUERY_TYPE,
thd->query(), thd->query_length(),
transactional_tables, FALSE, errcode);
}
thd->transaction.all.modified_non_trans_table= true;
}
@@ -1181,8 +1182,9 @@ end:
TRUNCATE must always be statement-based binlogged (not row-based) so
we don't test current_stmt_binlog_row_based.
*/
write_bin_log(thd, TRUE, thd->query(), thd->query_length());
my_ok(thd); // This should return record count
error= write_bin_log(thd, TRUE, thd->query(), thd->query_length());
if (!error)
my_ok(thd); // This should return record count
}
mysql_mutex_lock(&LOCK_open);
unlock_table_name(thd, table_list);