Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1772 05/03/03 19:49:58 stewart@stripped +7 -0
Add ndb/src/mgmapi/mgmapi_internal.h
move internal mgmapi functions into it.
should also fix AIX build problem.
ndb/src/ndbapi/ndb_cluster_connection.cpp
1.28 05/03/03 19:49:38 stewart@stripped +1 -0
use functions from mgmapi_internal.h
ndb/src/mgmapi/mgmapi.cpp
1.43 05/03/03 19:49:38 stewart@stripped +1 -0
some functions defined in mgmapi_internal.h
ndb/src/common/transporter/TransporterRegistry.cpp
1.51 05/03/03 19:49:37 stewart@stripped +1 -0
Use mgmapi_internal.h
ndb/src/common/transporter/Makefile.am
1.11 05/03/03 19:49:37 stewart@stripped +1 -1
Add ndb/src/mgmapi to include for common/transporter (TransporterRegistry requires the use of mgmapi_internal.h)
ndb/include/mgmapi/mgmapi_debug.h
1.7 05/03/03 19:49:37 stewart@stripped +0 -36
Move ndb_mgm_(get|set)_connection_int_parameter to mgmapi_internal.h
ndb/include/mgmapi/mgmapi.h
1.42 05/03/03 19:49:37 stewart@stripped +0 -11
Move ndb_mgm_convert_to_transporter to mgmapi_internal.h
Should fix AIX build problem
ndb/src/mgmapi/mgmapi_internal.h
1.1 05/03/03 19:22:24 stewart@stripped +77 -0
ndb/src/mgmapi/mgmapi_internal.h
1.0 05/03/03 19:22:24 stewart@stripped +0 -0
BitKeeper file /home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports/ndb/src/mgmapi/mgmapi_internal.h
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: stewart
# Host: kennedy.(none)
# Root: /home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
--- 1.41/ndb/include/mgmapi/mgmapi.h 2005-02-24 17:57:11 +11:00
+++ 1.42/ndb/include/mgmapi/mgmapi.h 2005-03-03 19:49:37 +11:00
@@ -140,7 +140,6 @@
*/
#include <ndb_types.h>
-#include <NdbTCP.h>
#include "ndb_logevent.h"
#include "mgmapi_config_parameters.h"
@@ -985,16 +984,6 @@
int ndb_mgm_alloc_nodeid(NdbMgmHandle handle,
unsigned version, int nodetype);
-
- /**
- * Convert connection to transporter
- * @param handle NDB management handle.
- *
- * @return socket
- *
- * @note the socket is now able to be used as a transporter connection
- */
- NDB_SOCKET_TYPE ndb_mgm_convert_to_transporter(NdbMgmHandle *handle);
/**
* Get the node id of the mgm server we're connected to
--- 1.6/ndb/include/mgmapi/mgmapi_debug.h 2005-01-12 18:13:44 +11:00
+++ 1.7/ndb/include/mgmapi/mgmapi_debug.h 2005-03-03 19:49:37 +11:00
@@ -132,42 +132,6 @@
const char * value,
struct ndb_mgm_reply* reply);
- /**
- * Set an integer parameter for a connection
- *
- * @param handle the NDB management handle.
- * @param node1 the node1 id
- * @param node2 the node2 id
- * @param param the parameter (e.g. CFG_CONNECTION_SERVER_PORT)
- * @param value what to set it to
- * @param reply from ndb_mgmd
- */
- int ndb_mgm_set_connection_int_parameter(NdbMgmHandle handle,
- int node1,
- int node2,
- int param,
- int value,
- struct ndb_mgm_reply* reply);
-
- /**
- * Get an integer parameter for a connection
- *
- * @param handle the NDB management handle.
- * @param node1 the node1 id
- * @param node2 the node2 id
- * @param param the parameter (e.g. CFG_CONNECTION_SERVER_PORT)
- * @param value where to store the retreived value. In the case of
- * error, value is not changed.
- * @param reply from ndb_mgmd
- * @return 0 on success. < 0 on error.
- */
- int ndb_mgm_get_connection_int_parameter(NdbMgmHandle handle,
- int node1,
- int node2,
- int param,
- int *value,
- struct ndb_mgm_reply* reply);
-
#ifdef __cplusplus
}
#endif
--- 1.50/ndb/src/common/transporter/TransporterRegistry.cpp 2005-03-01 19:53:47 +11:00
+++ 1.51/ndb/src/common/transporter/TransporterRegistry.cpp 2005-03-03 19:49:37 +11:00
@@ -49,6 +49,7 @@
#include <OutputStream.hpp>
#include <mgmapi/mgmapi.h>
+#include <mgmapi_internal.h>
#include <mgmapi/mgmapi_debug.h>
#include <EventLogger.hpp>
--- 1.42/ndb/src/mgmapi/mgmapi.cpp 2005-02-24 17:57:12 +11:00
+++ 1.43/ndb/src/mgmapi/mgmapi.cpp 2005-03-03 19:49:38 +11:00
@@ -23,6 +23,7 @@
#include <NdbSleep.h>
#include <NdbTCP.h>
#include <mgmapi.h>
+#include <mgmapi_internal.h>
#include <mgmapi_debug.h>
#include "mgmapi_configuration.hpp"
#include <socket_io.h>
--- New file ---
+++ ndb/src/mgmapi/mgmapi_internal.h 05/03/03 19:22:24
/* Copyright (C) 2005 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifndef MGMAPI_INTERNAL_H
#define MGMAPI_INTERNAL_H
#ifdef __cplusplus
extern "C" {
#endif
#include <NdbTCP.h>
/**
* Set an integer parameter for a connection
*
* @param handle the NDB management handle.
* @param node1 the node1 id
* @param node2 the node2 id
* @param param the parameter (e.g. CFG_CONNECTION_SERVER_PORT)
* @param value what to set it to
* @param reply from ndb_mgmd
*/
int ndb_mgm_set_connection_int_parameter(NdbMgmHandle handle,
int node1,
int node2,
int param,
int value,
struct ndb_mgm_reply* reply);
/**
* Get an integer parameter for a connection
*
* @param handle the NDB management handle.
* @param node1 the node1 id
* @param node2 the node2 id
* @param param the parameter (e.g. CFG_CONNECTION_SERVER_PORT)
* @param value where to store the retreived value. In the case of
* error, value is not changed.
* @param reply from ndb_mgmd
* @return 0 on success. < 0 on error.
*/
int ndb_mgm_get_connection_int_parameter(NdbMgmHandle handle,
int node1,
int node2,
int param,
int *value,
struct ndb_mgm_reply* reply);
/**
* Convert connection to transporter
* @param handle NDB management handle.
*
* @return socket
*
* @note the socket is now able to be used as a transporter connection
*/
NDB_SOCKET_TYPE ndb_mgm_convert_to_transporter(NdbMgmHandle *handle);
#ifdef __cplusplus
}
#endif
#endif
--- 1.10/ndb/src/common/transporter/Makefile.am 2004-12-23 02:28:56 +11:00
+++ 1.11/ndb/src/common/transporter/Makefile.am 2005-03-03 19:49:37 +11:00
@@ -13,7 +13,7 @@
libtransporter_la_LIBADD = @ndb_transporter_opt_objs@
libtransporter_la_DEPENDENCIES = @ndb_transporter_opt_objs@
-INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/include/debugger -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter @NDB_SCI_INCLUDES@
+INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/include/debugger -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter @NDB_SCI_INCLUDES@
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am
--- 1.27/ndb/src/ndbapi/ndb_cluster_connection.cpp 2005-02-25 23:21:15 +11:00
+++ 1.28/ndb/src/ndbapi/ndb_cluster_connection.cpp 2005-03-03 19:49:38 +11:00
@@ -29,6 +29,7 @@
#include <ConfigRetriever.hpp>
#include <ndb_version.h>
#include <mgmapi_debug.h>
+#include <mgmapi_internal.h>
#include <md5_hash.hpp>
#include <EventLogger.hpp>
| Thread |
|---|
| • bk commit into 5.0 tree (stewart:1.1772) | Stewart Smith | 3 Mar |
