bk commit into 5.1 tree (mskold:1.2314)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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@stripped, 2006-10-18 15:17:47+02:00, mskold@stripped +3 -0
  Merge mskold@stripped:/home/bk/mysql-5.1-ndb
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
  MERGE: 1.2312.1.2

  sql/ha_ndbcluster.cc@stripped, 2006-10-18 15:17:07+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.358.2.2

  sql/ha_partition.cc@stripped, 2006-10-18 15:17:08+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.72.2.5

  sql/ha_partition.h@stripped, 2006-10-18 15:17:08+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.27.1.2

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb/RESYNC

--- 1.361/sql/ha_ndbcluster.cc	2006-10-18 15:18:36 +02:00
+++ 1.362/sql/ha_ndbcluster.cc	2006-10-18 15:18:36 +02:00
@@ -469,11 +469,13 @@ ha_rows ha_ndbcluster::records()
   DBUG_RETURN(retval + info->no_uncommitted_rows_count);
 }
 
-void ha_ndbcluster::records_update()
+int ha_ndbcluster::records_update()
 {
   if (m_ha_not_exact_count)
-    return;
+    return 0;
   DBUG_ENTER("ha_ndbcluster::records_update");
+  int result= 0;
+
   struct Ndb_local_table_statistics *info= m_table_info;
   DBUG_PRINT("info", ("id=%d, no_uncommitted_rows_count=%d",
                       ((const NDBTAB *)m_table)->getTableId(),
@@ -483,7 +485,7 @@ void ha_ndbcluster::records_update()
     Ndb *ndb= get_ndb();
     struct Ndb_statistics stat;
     ndb->setDatabaseName(m_dbname);
-    if (ndb_get_table_statistics(ndb, m_table, &stat) == 0)
+    if ((result= ndb_get_table_statistics(ndb, m_table, &stat)) == 0)
     {
       stats.mean_rec_length= stat.row_size;
       stats.data_file_length= stat.fragment_memory;
@@ -496,7 +498,7 @@ void ha_ndbcluster::records_update()
       info->no_uncommitted_rows_count= 0;
   }
   stats.records= info->records+ info->no_uncommitted_rows_count;
-  DBUG_VOID_RETURN;
+  DBUG_RETURN(result);
 }
 
 void ha_ndbcluster::no_uncommitted_rows_execute_failure()
@@ -3649,8 +3651,9 @@ void ha_ndbcluster::position(const byte 
 }
 
 
-void ha_ndbcluster::info(uint flag)
+int ha_ndbcluster::info(uint flag)
 {
+  int result= 0;
   DBUG_ENTER("info");
   DBUG_PRINT("enter", ("flag: %d", flag));
   
@@ -3668,18 +3671,18 @@ void ha_ndbcluster::info(uint flag)
       if (m_ha_not_exact_count)
         stats.records= 100;
       else
-        records_update();
+	result= records_update();
     }
     else
     {
       if ((my_errno= check_ndb_connection()))
-        DBUG_VOID_RETURN;
+        DBUG_RETURN(my_errno);
       Ndb *ndb= get_ndb();
       ndb->setDatabaseName(m_dbname);
       struct Ndb_statistics stat;
       ndb->setDatabaseName(m_dbname);
       if (current_thd->variables.ndb_use_exact_count &&
-          ndb_get_table_statistics(ndb, m_table, &stat) == 0)
+          (result= ndb_get_table_statistics(ndb, m_table, &stat)) == 0)
       {
         stats.mean_rec_length= stat.row_size;
         stats.data_file_length= stat.fragment_memory;
@@ -3723,7 +3726,11 @@ void ha_ndbcluster::info(uint flag)
         stats.auto_increment_value= (ulonglong)auto_increment_value64;
     }
   }
-  DBUG_VOID_RETURN;
+
+  if(result == -1)
+    result= HA_ERR_NO_CONNECTION;
+
+  DBUG_RETURN(result);
 }
 
 

--- 1.77/sql/ha_partition.cc	2006-10-18 15:18:38 +02:00
+++ 1.78/sql/ha_partition.cc	2006-10-18 15:18:38 +02:00
@@ -4241,7 +4241,7 @@ void ha_partition::include_partition_fie
       retrieving statistics data.
 */
 
-void ha_partition::info(uint flag)
+int ha_partition::info(uint flag)
 {
   handler *file, **file_array;
   DBUG_ENTER("ha_partition:info");
@@ -4405,7 +4405,7 @@ void ha_partition::info(uint flag)
 	stats.update_time= file->stats.update_time;
     } while (*(++file_array));
   }
-  DBUG_VOID_RETURN;
+  DBUG_RETURN(0);
 }
 
 

--- 1.29/sql/ha_partition.h	2006-10-18 15:18:38 +02:00
+++ 1.30/sql/ha_partition.h	2006-10-18 15:18:38 +02:00
@@ -450,7 +450,7 @@ public:
     purposes.
     -------------------------------------------------------------------------
   */
-  virtual void info(uint);
+  virtual int info(uint);
   void get_dynamic_partition_info(PARTITION_INFO *stat_info,
                                   uint part_id);
   virtual int extra(enum ha_extra_function operation);