diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-06 13:28:06 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-06 13:28:06 +0300 |
| commit | 9c030fe5081163babdc8ef24395d108a394107fe (patch) | |
| tree | 16fe2efa0a3d5e40e00972a1dc3bc4e13f71170c /sql/rpl_injector.cc | |
| parent | 0b2f51664d38ed24f3f8b237877520e45bfe83f6 (diff) | |
| parent | 19df110369d4cef5303176a8aedca34cd0e2d271 (diff) | |
| download | mariadb-git-9c030fe5081163babdc8ef24395d108a394107fe.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/rpl_injector.cc')
| -rw-r--r-- | sql/rpl_injector.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sql/rpl_injector.cc b/sql/rpl_injector.cc index c8d561af1c2..08d81e10d59 100644 --- a/sql/rpl_injector.cc +++ b/sql/rpl_injector.cc @@ -117,8 +117,9 @@ int injector::transaction::write_row (server_id_type sid, table tbl, record_type record) { DBUG_ENTER("injector::transaction::write_row(...)"); - int error= 0; - if (error= check_state(ROW_STATE)) + + int error= check_state(ROW_STATE); + if (error) DBUG_RETURN(error); server_id_type save_id= m_thd->server_id; @@ -136,8 +137,8 @@ int injector::transaction::delete_row(server_id_type sid, table tbl, { DBUG_ENTER("injector::transaction::delete_row(...)"); - int error= 0; - if (error= check_state(ROW_STATE)) + int error= check_state(ROW_STATE); + if (error) DBUG_RETURN(error); server_id_type save_id= m_thd->server_id; @@ -155,8 +156,8 @@ int injector::transaction::update_row(server_id_type sid, table tbl, { DBUG_ENTER("injector::transaction::update_row(...)"); - int error= 0; - if (error= check_state(ROW_STATE)) + int error= check_state(ROW_STATE); + if (error) DBUG_RETURN(error); server_id_type save_id= m_thd->server_id; |