diff options
| author | unknown <stewart@mysql.com> | 2005-08-19 00:39:56 +1000 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2005-08-19 00:39:56 +1000 |
| commit | b0dee441164b751c6393f08319c063a1a70d0e32 (patch) | |
| tree | 00418d060ffeeaebd17a35fa1eb91f2e29961cc6 /ndb/include | |
| parent | f2727ff26a160f981d300edd6cba79e49867db58 (diff) | |
| parent | 749f599efa81de151401d0af33c4b31292727b15 (diff) | |
| download | mariadb-git-b0dee441164b751c6393f08319c063a1a70d0e32.tar.gz | |
merge fix
ndb/src/mgmapi/mgmapi.cpp:
merge
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 018e554de7c..924d65c2847 100644 --- a/ndb/include/mgmapi/mgmapi.h +++ b/ndb/include/mgmapi/mgmapi.h @@ -139,6 +139,7 @@ * @{ */ +#include <stdio.h> #include <ndb_types.h> #include "ndb_logevent.h" #include "mgmapi_config_parameters.h" @@ -441,6 +442,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 33134899d1e..8f95e159b38 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 |