diff options
| author | unknown <stewart@mysql.com> | 2005-02-01 11:45:05 +1100 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2005-02-01 11:45:05 +1100 |
| commit | 098fc22417ee3431c8c28fba3eebe8450e8f602c (patch) | |
| tree | 6ccae14192f06556abbf58565cf1979aca1bc13d /ndb/src/mgmapi | |
| parent | ce538ca115a8e4af47845ea384b64a4cae3b595e (diff) | |
| parent | cdce11a32b3f7801e942bd14b29f233008e335b9 (diff) | |
| download | mariadb-git-098fc22417ee3431c8c28fba3eebe8450e8f602c.tar.gz | |
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl5
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/cw/cpcd/main.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
Diffstat (limited to 'ndb/src/mgmapi')
| -rw-r--r-- | ndb/src/mgmapi/ndb_logevent.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ndb/src/mgmapi/ndb_logevent.cpp b/ndb/src/mgmapi/ndb_logevent.cpp index 89ca9a50883..2817abcfdbb 100644 --- a/ndb/src/mgmapi/ndb_logevent.cpp +++ b/ndb/src/mgmapi/ndb_logevent.cpp @@ -197,10 +197,16 @@ struct Ndb_logevent_body_row ndb_logevent_body[]= { ROW( NODE_FAILREP, "failure_state", 2, failure_state), /* TODO */ -// ROW( ArbitState), + ROW( ArbitState, "code", 1, code), + ROW( ArbitState, "arbit_node", 2, arbit_node), + ROW( ArbitState, "ticket_0", 3, ticket_0), + ROW( ArbitState, "ticket_1", 4, ticket_1), /* TODO */ -// ROW( ArbitResult), + ROW( ArbitResult, "code", 1, code), + ROW( ArbitResult, "arbit_node", 2, arbit_node), + ROW( ArbitResult, "ticket_0", 3, ticket_0), + ROW( ArbitResult, "ticket_1", 4, ticket_1), // ROW( GCP_TakeoverStarted), |