diff options
| author | sergefp@mysql.com <> | 2005-08-27 02:33:06 +0400 |
|---|---|---|
| committer | sergefp@mysql.com <> | 2005-08-27 02:33:06 +0400 |
| commit | ad9bfc251c6604b1fac9822020d9f1d2eb300dc4 (patch) | |
| tree | c1da247a061c35537652a59670be0d73b7861a51 /sql/sql_delete.cc | |
| parent | e4733cc8b06127c754af56f17d86d7ecf78325b7 (diff) | |
| download | mariadb-git-ad9bfc251c6604b1fac9822020d9f1d2eb300dc4.tar.gz | |
Slightly amended Monty's SP replication code cleanup patch
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 7c012e3b442..4ec5b43f8e7 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -14,15 +14,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - /* Delete of records and truncate of tables. Multi-table deletes were introduced by Monty and Sinisa */ - - #include "mysql_priv.h" #include "ha_innodb.h" #include "sql_select.h" @@ -254,8 +251,7 @@ cleanup: thd->clear_error(); Query_log_event qinfo(thd, thd->query, thd->query_length, transactional_table, FALSE); - if ((thd->query_str_binlog_unsuitable || mysql_bin_log.write(&qinfo)) - && transactional_table) + if (mysql_bin_log.write(&qinfo) && transactional_table) error=1; } if (!transactional_table) @@ -720,8 +716,7 @@ bool multi_delete::send_eof() thd->clear_error(); Query_log_event qinfo(thd, thd->query, thd->query_length, transactional_tables, FALSE); - if ((thd->query_str_binlog_unsuitable || mysql_bin_log.write(&qinfo)) - && !normal_tables) + if (mysql_bin_log.write(&qinfo) && !normal_tables) local_error=1; // Log write failed: roll back the SQL statement } if (!transactional_tables) |