diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2010-01-24 15:03:23 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2010-01-24 15:03:23 +0800 |
| commit | 6bf8c119feff7e15d19aea0a6893b2706891d3c1 (patch) | |
| tree | 30ea0d6bf62fef90f4f1499d15e388cb43241707 /sql/sql_partition.cc | |
| parent | a365016f8b0cf007d40d12405a3b7b3990951ba2 (diff) | |
| download | mariadb-git-6bf8c119feff7e15d19aea0a6893b2706891d3c1.tar.gz | |
Backport Bug#37148 to 5.1
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 329317f4293..275115e3cbd 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4113,8 +4113,9 @@ static int fast_end_partition(THD *thd, ulonglong copied, } if ((!is_empty) && (!written_bin_log) && - (!thd->lex->no_write_to_binlog)) - write_bin_log(thd, FALSE, thd->query(), thd->query_length()); + (!thd->lex->no_write_to_binlog) && + write_bin_log(thd, FALSE, thd->query(), thd->query_length())) + DBUG_RETURN(TRUE); my_snprintf(tmp_name, sizeof(tmp_name), ER(ER_INSERT_INFO), (ulong) (copied + deleted), |