diff options
| author | unknown <joreland@mysql.com> | 2005-07-25 12:42:32 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-07-25 12:42:32 +0200 |
| commit | b68c1a71aaf1598ac4d0e04826cbc9ca1c915990 (patch) | |
| tree | 75dac9f0dc8f6291201f3530e549b38e9987bcc8 /ndb/include | |
| parent | 824f512e4909ceb1e9eb2360a273a524e3930a9f (diff) | |
| parent | ea010ef58494b9e578ce85b890f4a95769227729 (diff) | |
| download | mariadb-git-b68c1a71aaf1598ac4d0e04826cbc9ca1c915990.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-push
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/mgmapi/mgmapi.h | 7 | ||||
| -rw-r--r-- | ndb/include/mgmapi/mgmapi_config_parameters.h | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ndb/include/mgmapi/mgmapi.h b/ndb/include/mgmapi/mgmapi.h index fa0774afa06..26b9dc65947 100644 --- a/ndb/include/mgmapi/mgmapi.h +++ b/ndb/include/mgmapi/mgmapi.h @@ -49,6 +49,7 @@ * @{ */ +#include <stdio.h> #include <ndb_types.h> #include "mgmapi_config_parameters.h" @@ -351,6 +352,12 @@ extern "C" { int ndb_mgm_get_latest_error_line(const NdbMgmHandle handle); #endif + /** + * Set error stream + */ + void ndb_mgm_set_error_stream(NdbMgmHandle, FILE *); + + /** @} *********************************************************************/ /** * @name Functions: Create/Destroy Management Server Handles diff --git a/ndb/include/mgmapi/mgmapi_config_parameters.h b/ndb/include/mgmapi/mgmapi_config_parameters.h index 432854d1d36..2e3b47eb42e 100644 --- a/ndb/include/mgmapi/mgmapi_config_parameters.h +++ b/ndb/include/mgmapi/mgmapi_config_parameters.h @@ -50,8 +50,11 @@ #define CFG_DB_FILESYSTEM_PATH 125 #define CFG_DB_NO_REDOLOG_FILES 126 -#define CFG_DB_DISC_BANDWIDTH 127 -#define CFG_DB_SR_DISC_BANDWITH 128 + +#define CFG_DB_LCP_DISC_PAGES_TUP 127 +#define CFG_DB_LCP_DISC_PAGES_TUP_SR 128 +#define CFG_DB_LCP_DISC_PAGES_ACC 137 +#define CFG_DB_LCP_DISC_PAGES_ACC_SR 138 #define CFG_DB_TRANSACTION_CHECK_INTERVAL 129 #define CFG_DB_TRANSACTION_INACTIVE_TIMEOUT 130 |