diff options
| author | unknown <stewart@mysql.com> | 2006-06-20 18:27:54 +1000 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2006-06-20 18:27:54 +1000 |
| commit | 0f6a24ad6c0c5caef0101c56ad1a6c2313d103d6 (patch) | |
| tree | 5cba329395a62bbf9b702bc85d7c959c78a9b623 /ndb/src/mgmapi/mgmapi.cpp | |
| parent | 375a1894512b80302fb73858759050d3d56b58bf (diff) | |
| parent | 773e91d5133b0be1be41a412d6036e2735c77d70 (diff) | |
| download | mariadb-git-0f6a24ad6c0c5caef0101c56ad1a6c2313d103d6.tar.gz | |
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
Diffstat (limited to 'ndb/src/mgmapi/mgmapi.cpp')
| -rw-r--r-- | ndb/src/mgmapi/mgmapi.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp index 7ad20e504f6..4428b158b6b 100644 --- a/ndb/src/mgmapi/mgmapi.cpp +++ b/ndb/src/mgmapi/mgmapi.cpp @@ -1945,7 +1945,7 @@ ndb_mgm_get_configuration(NdbMgmHandle handle, unsigned int version) { } delete prop; - return (ndb_mgm_configuration*)cvf.m_cfg; + return (ndb_mgm_configuration*)cvf.getConfigValues(); } while(0); delete prop; |