bk commit into 5.0 tree (magnus:1.1844) BUG#8585

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of magnus. When magnus does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1844 05/03/31 14:33:50 magnus@stripped +2 -0
  BUG#8585 ndb_cache2
   - When deleting from a cursor the m_rows_changed variable was not properly incremented
to indicate that m_share->commit_count should be cleared at end of trans.
    

  BitKeeper/etc/logging_ok
    1.311 05/03/31 14:32:49 magnus@stripped +1 -0
    Logging to logging@stripped accepted

  sql/ha_ndbcluster.cc
    1.167 05/03/31 14:32:40 magnus@stripped +1 -2
    Moved increment of m_rows_changed to higher up in the function.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	magnus
# Host:	msdesk.mysql.com
# Root:	/home/magnus/mysql-5.0

--- 1.310/BitKeeper/etc/logging_ok	2005-03-30 14:13:56 +02:00
+++ 1.311/BitKeeper/etc/logging_ok	2005-03-31 14:32:49 +02:00
@@ -120,6 +120,7 @@
 lars@stripped
 lenz@stripped
 lenz@stripped
+magnus@stripped
 magnus@neptunus.(none)
 magnus@shellback.(none)
 marko@stripped

--- 1.166/sql/ha_ndbcluster.cc	2005-03-22 22:31:47 +01:00
+++ 1.167/sql/ha_ndbcluster.cc	2005-03-31 14:32:40 +02:00
@@ -2171,6 +2171,7 @@
   DBUG_ENTER("delete_row");
 
   statistic_increment(thd->status_var.ha_delete_count,&LOCK_status);
+  m_rows_changed++;
 
   if (cursor)
   {
@@ -2220,8 +2221,6 @@
           return res;  
     }
   }
-
-  m_rows_changed++;
 
   // Execute delete operation
   if (execute_no_commit(this,trans) != 0) {