database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Post-merge fix.

Browse Source
This commit is contained in:
Alexander Nozdrin
2009-12-15 10:31:49 +03:00
parent 83aa3cf4e3
commit efaa28abb4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_delete.cc
View File

@@ -1183,12 +1183,10 @@ end:
{ {
/* In RBR, the statement is not binlogged if the table is temporary. */ /* In RBR, the statement is not binlogged if the table is temporary. */
if (!is_temporary_table || !thd->current_stmt_binlog_row_based) if (!is_temporary_table || !thd->current_stmt_binlog_row_based)
{
error= write_bin_log(thd, TRUE, thd->query(), thd->query_length()); error= write_bin_log(thd, TRUE, thd->query(), thd->query_length());
if (!error) if (!error)
my_ok(thd); // This should return record count my_ok(thd); // This should return record count
} }
}
pthread_mutex_lock(&LOCK_open); pthread_mutex_lock(&LOCK_open);
unlock_table_name(thd, table_list); unlock_table_name(thd, table_list);
pthread_mutex_unlock(&LOCK_open); pthread_mutex_unlock(&LOCK_open);