diff options
| author | gni/ngb@dev3-221.dev.cn.tlan <> | 2007-11-14 10:33:51 +0800 |
|---|---|---|
| committer | gni/ngb@dev3-221.dev.cn.tlan <> | 2007-11-14 10:33:51 +0800 |
| commit | b1d880ea712a65521b300eb70d688a29aa8afe4d (patch) | |
| tree | 76a49ce6c9fd4bae68b22a617668f22ed575ad58 /ndb | |
| parent | 83eed4d8766bd55c4187293a6f93635b19e8f54d (diff) | |
| parent | 6acee16fad28e84ad6db0ee0503d816765b944f1 (diff) | |
| download | mariadb-git-b1d880ea712a65521b300eb70d688a29aa8afe4d.tar.gz | |
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
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/include/mgmapi/ndb_logevent.h | 8 | ||||
| -rw-r--r-- | ndb/src/mgmapi/ndb_logevent.cpp | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ndb/include/mgmapi/ndb_logevent.h b/ndb/include/mgmapi/ndb_logevent.h index 76e4c31baa2..389004da06b 100644 --- a/ndb/include/mgmapi/ndb_logevent.h +++ b/ndb/include/mgmapi/ndb_logevent.h @@ -551,7 +551,13 @@ extern "C" { /** 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; diff --git a/ndb/src/mgmapi/ndb_logevent.cpp b/ndb/src/mgmapi/ndb_logevent.cpp index 3885bb79536..f0b7c26cf78 100644 --- a/ndb/src/mgmapi/ndb_logevent.cpp +++ b/ndb/src/mgmapi/ndb_logevent.cpp @@ -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), |