Commit b1d880ea authored by gni/ngb@dev3-221.dev.cn.tlan's avatar gni/ngb@dev3-221.dev.cn.tlan
Browse files

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj 

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug30271
parents 83eed4d8 6acee16f

ndb/include/mgmapi/ndb_logevent.h

+7 −1
Original line number Diff line number Diff line
@@ -551,7 +551,13 @@ extern "C" { 
      /** Log event specific data for for corresponding NDB_LE_ log event */

      struct {

	int      gth;

        /* 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;

ndb/src/mgmapi/ndb_logevent.cpp

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ struct Ndb_logevent_body_row ndb_logevent_body[]= { 
  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),