bk commit into 5.1 tree (tomas:1.2366)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2366 06/04/20 03:05:50 tomas@stripped +2 -0
  ndb uncomitted row count cont'd, applying new fix since last one was no good

  sql/ha_ndbcluster.h
    1.133 06/04/20 03:05:42 tomas@stripped +0 -1
    ndb uncomitted row count cont'd, applying new fix since last one was no good

  sql/ha_ndbcluster.cc
    1.302 06/04/20 03:05:42 tomas@stripped +11 -22
    ndb uncomitted row count cont'd, applying new fix since last one was no good

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.301/sql/ha_ndbcluster.cc	2006-04-19 23:49:43 +02:00
+++ 1.302/sql/ha_ndbcluster.cc	2006-04-20 03:05:42 +02:00
@@ -363,6 +363,8 @@
 void
 Thd_ndb::init_open_tables()
 {
+  count= 0;
+  error= 0;
   my_hash_reset(&open_tables);
 }
 
@@ -380,8 +382,17 @@
     thd_ndb_share= (THD_NDB_SHARE *) alloc_root(&thd->transaction.mem_root,
                                                 sizeof(THD_NDB_SHARE));
     thd_ndb_share->key= key;
+    thd_ndb_share->stat.last_count= count;
+    thd_ndb_share->stat.no_uncommitted_rows_count= 0;
+    thd_ndb_share->stat.records == ~(ha_rows)0;
     my_hash_insert(&open_tables, (byte *)thd_ndb_share);
   }
+  else if (thd_ndb_share->stat.last_count != count)
+  {
+    thd_ndb_share->stat.last_count= count;
+    thd_ndb_share->stat.no_uncommitted_rows_count= 0;
+    thd_ndb_share->stat.records == ~(ha_rows)0;
+  }
   DBUG_PRINT("exit", ("thd_ndb_share: 0x%x  key: 0x%x", thd_ndb_share, key));
   DBUG_RETURN(thd_ndb_share);
 }
@@ -444,25 +455,6 @@
   DBUG_VOID_RETURN;
 }
 
-void ha_ndbcluster::no_uncommitted_rows_init(THD *thd)
-{
-  if (m_ha_not_exact_count)
-    return;
-  DBUG_ENTER("ha_ndbcluster::no_uncommitted_rows_init");
-  struct Ndb_local_table_statistics *info= m_table_info;
-  Thd_ndb *thd_ndb= get_thd_ndb(thd);
-  if (info->last_count != thd_ndb->count)
-  {
-    info->last_count= thd_ndb->count;
-    info->no_uncommitted_rows_count= 0;
-    info->records= ~(ha_rows)0;
-    DBUG_PRINT("info", ("id=%d, no_uncommitted_rows_count=%d",
-                        ((const NDBTAB *)m_table)->getTableId(),
-                        info->no_uncommitted_rows_count));
-  }
-  DBUG_VOID_RETURN;
-}
-
 void ha_ndbcluster::no_uncommitted_rows_update(int c)
 {
   if (m_ha_not_exact_count)
@@ -3946,7 +3938,6 @@
         if (trans == NULL)
           ERR_RETURN(ndb->getNdbError());
         thd_ndb->init_open_tables();
-        no_uncommitted_rows_reset(thd);
         thd_ndb->stmt= trans;
         trans_register_ha(thd, FALSE, &ndbcluster_hton);
       } 
@@ -3962,7 +3953,6 @@
           if (trans == NULL)
             ERR_RETURN(ndb->getNdbError());
           thd_ndb->init_open_tables();
-          no_uncommitted_rows_reset(thd);
           thd_ndb->all= trans; 
           trans_register_ha(thd, TRUE, &ndbcluster_hton);
 
@@ -4041,7 +4031,6 @@
     }
     m_thd_ndb_share= thd_ndb->get_open_table(thd, m_table);
     m_table_info= &m_thd_ndb_share->stat;
-    no_uncommitted_rows_init(thd);
   }
   else
   {

--- 1.132/sql/ha_ndbcluster.h	2006-04-19 18:29:18 +02:00
+++ 1.133/sql/ha_ndbcluster.h	2006-04-20 03:05:42 +02:00
@@ -809,7 +809,6 @@
   void records_update();
   void no_uncommitted_rows_execute_failure();
   void no_uncommitted_rows_update(int);
-  void no_uncommitted_rows_init(THD *);
   void no_uncommitted_rows_reset(THD *);
 
   /*