Post-merge fix.
This commit is contained in:
parent
83aa3cf4e3
commit
efaa28abb4
@ -1183,11 +1183,9 @@ 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);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user