diff options
| author | magnus@msdesk.mysql.com <> | 2005-03-31 14:37:22 +0200 |
|---|---|---|
| committer | magnus@msdesk.mysql.com <> | 2005-03-31 14:37:22 +0200 |
| commit | 9c9149571d0fa42be28ec221277b382935cb0e82 (patch) | |
| tree | d87c95af75841b8fdb92908bbd208af589f67c4e | |
| parent | 830b088fdec9814bfee70cdca052c6bd0cbb05d2 (diff) | |
| parent | e8434aadca5d195304c7ab94e699d8fe8cb15a80 (diff) | |
| download | mariadb-git-9c9149571d0fa42be28ec221277b382935cb0e82.tar.gz | |
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
into msdesk.mysql.com:/home/magnus/mysql-5.0
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 22808697471..74619cbb80c 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -120,6 +120,7 @@ kostja@oak.local lars@mysql.com lenz@kallisto.mysql.com lenz@mysql.com +magnus@msdesk.mysql.com magnus@neptunus.(none) magnus@shellback.(none) marko@hundin.mysql.fi diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index edeb702145d..8dfc2d82ccc 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -2171,6 +2171,7 @@ int ha_ndbcluster::delete_row(const byte *record) DBUG_ENTER("delete_row"); statistic_increment(thd->status_var.ha_delete_count,&LOCK_status); + m_rows_changed++; if (cursor) { @@ -2221,8 +2222,6 @@ int ha_ndbcluster::delete_row(const byte *record) } } - m_rows_changed++; - // Execute delete operation if (execute_no_commit(this,trans) != 0) { no_uncommitted_rows_execute_failure(); |