bk commit into 5.0 tree (gni:1.2474) BUG#30271

[gni]

Below is the list of changes that have just been committed into a local
5.0 repository of gni. When gni 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, 2007-08-17 14:32:39+08:00, gni@stripped +2 -0
  BUG#30271 NDB_LE_MemoryUsage.page_size_kb actually returns page size in bytes, not
kilobyte

  ndb/include/mgmapi/ndb_logevent.h@stripped, 2007-08-17 14:32:37+08:00,
gni@stripped +7 -1
    Add page_size_bytes member variable for MemoryUsage. And don't remove page_size_kb
member variable at present for the compatibility backward. 

  ndb/src/mgmapi/ndb_logevent.cpp@stripped, 2007-08-17 14:32:37+08:00,
gni@stripped +1 -1
    change the page_size_kb member variable of MemoryUsage to page_size_bytes

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.0/bug30271

--- 1.8/ndb/include/mgmapi/ndb_logevent.h	2007-08-17 14:32:45 +08:00
+++ 1.9/ndb/include/mgmapi/ndb_logevent.h	2007-08-17 14:32:45 +08:00
@@ -551,7 +551,13 @@
       /** Log event specific data for for corresponding NDB_LE_ log event */
       struct {
 	int      gth;
-	unsigned page_size_kb;
+        /* union is for compatibility backward.
+         * page_size_kb member variable should be removed in the future
+        */
+        union {
+	  unsigned page_size_kb;
+          unsigned page_size_bytes;
+        };
 	unsigned pages_used;
 	unsigned pages_total;
 	unsigned block;

--- 1.10/ndb/src/mgmapi/ndb_logevent.cpp	2007-08-17 14:32:45 +08:00
+++ 1.11/ndb/src/mgmapi/ndb_logevent.cpp	2007-08-17 14:32:45 +08:00
@@ -256,7 +256,7 @@
   ROW( ReceiveBytesStatistic, "mean_received_bytes", 2, mean_received_bytes),
 
   ROW( MemoryUsage, "gth",          1, gth),
-  ROW( MemoryUsage, "page_size_kb", 2, page_size_kb),
+  ROW( MemoryUsage, "page_size_bytes", 2, page_size_bytes),
   ROW( MemoryUsage, "pages_used",   3, pages_used),
   ROW( MemoryUsage, "pages_total",  4, pages_total),
   ROW( MemoryUsage, "block",        5, block),