hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mistakes in merging.

Browse Source
This commit is contained in:
counterpoint
2015-11-11 11:31:07 +00:00
parent dee20fe077
commit 2183d5d3c5
2 changed files with 105 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/core/buffer.c
View File

@ -56,11 +56,6 @@
static HASHTABLE *buffer_hashtable = NULL; static HASHTABLE *buffer_hashtable = NULL;
#endif #endif
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static buffer_object_t* gwbuf_remove_buffer_object( static buffer_object_t* gwbuf_remove_buffer_object(
GWBUF* buf, GWBUF* buf,
buffer_object_t* bufobj); buffer_object_t* bufobj);

15
server/modules/routing/debugcmd.c
View File

@ -125,8 +125,10 @@ struct subcommand showoptions[] = {
"Show a single descriptor control block e.g. show dcb 0x493340", "Show a single descriptor control block e.g. show dcb 0x493340",
{ARG_TYPE_DCB, 0, 0} }, {ARG_TYPE_DCB, 0, 0} },
{ "dbusers", 1, dcb_usersPrint, { "dbusers", 1, dcb_usersPrint,
"Show statistics and user names for a service's user table.\n\t\tExample : show dbusers <service name>", "Show statistics and user names for a service's user table.\n"
"Show statistics and user names for a service's user table.\n\t\tExample : show dbusers <ptr of 'User's data' from services list>|<service name>", "\t\tExample : show dbusers <service name>",
"Show statistics and user names for a service's user table.\n"
"\t\tExample : show dbusers <ptr of 'User's data' from services list>|<service name>",
{ARG_TYPE_DBUSERS, 0, 0} }, {ARG_TYPE_DBUSERS, 0, 0} },
{ "epoll", 0, dprintPollStats, { "epoll", 0, dprintPollStats,
"Show the poll statistics", "Show the poll statistics",
@ -166,11 +168,13 @@ struct subcommand showoptions[] = {
{0, 0, 0} }, {0, 0, 0} },
{ "persistent", 1, dprintPersistentDCBs, { "persistent", 1, dprintPersistentDCBs,
"Show persistent pool for a named server, e.g. show persistent dbnode1", "Show persistent pool for a named server, e.g. show persistent dbnode1",
"Show persistent pool for a server, e.g. show persistent 0x485390. The address may also be replaced with the server name from the configuration file", "Show persistent pool for a server, e.g. show persistent 0x485390. "
"The address may also be replaced with the server name from the configuration file",
{ARG_TYPE_SERVER, 0, 0} }, {ARG_TYPE_SERVER, 0, 0} },
{ "server", 1, dprintServer, { "server", 1, dprintServer,
"Show details for a named server, e.g. show server dbnode1", "Show details for a named server, e.g. show server dbnode1",
"Show details for a server, e.g. show server 0x485390. The address may also be repalced with the server name from the configuration file", "Show details for a server, e.g. show server 0x485390. The address may also be "
"repalced with the server name from the configuration file",
{ARG_TYPE_SERVER, 0, 0} }, {ARG_TYPE_SERVER, 0, 0} },
{ "servers", 0, dprintAllServers, { "servers", 0, dprintAllServers,
"Show all configured servers", "Show all configured servers",
@ -714,14 +718,13 @@ static struct {
* Convert a string argument to a numeric, observing prefixes * Convert a string argument to a numeric, observing prefixes
* for number bases, e.g. 0x for hex, 0 for octal * for number bases, e.g. 0x for hex, 0 for octal
* *
* @param dcb The client DCB
* @param mode The CLI mode * @param mode The CLI mode
* @param arg The string representation of the argument * @param arg The string representation of the argument
* @param arg_type The target type for the argument * @param arg_type The target type for the argument
* @return The argument as a long integer * @return The argument as a long integer
*/ */
static unsigned long static unsigned long
convert_arg(DCB* dcb, int mode, char *arg, int arg_type) convert_arg(int mode, char *arg, int arg_type)
{ {
unsigned long rval; unsigned long rval;
SERVICE *service; SERVICE *service;