Commit 9c914957 authored by magnus@msdesk.mysql.com's avatar magnus@msdesk.mysql.com

Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0

into msdesk.mysql.com:/home/magnus/mysql-5.0
parents 830b088f e8434aad
...@@ -120,6 +120,7 @@ kostja@oak.local ...@@ -120,6 +120,7 @@ kostja@oak.local
lars@mysql.com lars@mysql.com
lenz@kallisto.mysql.com lenz@kallisto.mysql.com
lenz@mysql.com lenz@mysql.com
magnus@msdesk.mysql.com
magnus@neptunus.(none) magnus@neptunus.(none)
magnus@shellback.(none) magnus@shellback.(none)
marko@hundin.mysql.fi marko@hundin.mysql.fi
......
...@@ -2171,6 +2171,7 @@ int ha_ndbcluster::delete_row(const byte *record) ...@@ -2171,6 +2171,7 @@ int ha_ndbcluster::delete_row(const byte *record)
DBUG_ENTER("delete_row"); DBUG_ENTER("delete_row");
statistic_increment(thd->status_var.ha_delete_count,&LOCK_status); statistic_increment(thd->status_var.ha_delete_count,&LOCK_status);
m_rows_changed++;
if (cursor) if (cursor)
{ {
...@@ -2221,8 +2222,6 @@ int ha_ndbcluster::delete_row(const byte *record) ...@@ -2221,8 +2222,6 @@ int ha_ndbcluster::delete_row(const byte *record)
} }
} }
m_rows_changed++;
// Execute delete operation // Execute delete operation
if (execute_no_commit(this,trans) != 0) { if (execute_no_commit(this,trans) != 0) {
no_uncommitted_rows_execute_failure(); no_uncommitted_rows_execute_failure();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment