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

query_classifier.cc

Browse Source 
Replaced fprintf's with log write commands, removed the second argument from call of mysql_reset_thd_for_next_command(thd) according to changes in mariadb/5.5/sql/sql_parse.c #rev 3958.

server/Makefile
	Instead of installing MaxScale.cnf (and overwriting previous config file), install MaxScale_template.cnf to DEST directory.

config.c
	Replace references to 'Gateway' with 'MaxScale', change configuration parameter 'auth' to 'passwd' as it is named in other instances where referenced to password.
This commit is contained in:
vraatikka
2013-11-20 15:55:43 +02:00
parent 0f120e5593
commit 4b1527b1c8
4 changed files with 174 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/core/config.c
View File

@ -100,7 +100,7 @@ CONFIG_PARAMETER *param;
}
/**
* Load the configuration file for the gateway
* Load the configuration file for the MaxScale
*
* @param file The filename of the configuration file
* @return A zero return indicates a fatal error reading the configuration
@ -129,7 +129,7 @@ int rval;
}
/**
* Reload the configuration file for the gateway
* Reload the configuration file for the MaxScale
*
* @return A zero return indicates a fatal error reading the configuration
*/
@ -194,7 +194,7 @@ int error_count = 0;
char *user =
config_get_value(obj->parameters, "user");
char *auth =
config_get_value(obj->parameters, "auth");
config_get_value(obj->parameters, "passwd");
if (obj->element && user && auth)
serviceSetUser(obj->element, user, auth);
}
@ -475,7 +475,7 @@ config_threadcount()
}
/**
* Configuration handler for items in the global [gateway] section
* Configuration handler for items in the global [MaxScale] section
*
* @param name The item name
* @param value The item value
@ -541,7 +541,7 @@ SERVER *server;
user = config_get_value(obj->parameters,
"user");
auth = config_get_value(obj->parameters,
"auth");
"passwd");
if (user && auth)
service_update(service, router,
user,
@ -556,7 +556,7 @@ SERVER *server;
user = config_get_value(obj->parameters,
"user");
auth = config_get_value(obj->parameters,
"auth");
"passwd");
obj->element = service_alloc(obj->object,
router);
@ -736,7 +736,7 @@ static char *service_params[] =
"router_options",
"servers",
"user",
"auth",
"passwd",
NULL
};
@ -811,7 +811,7 @@ int i;
skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Unexpected parameter "
"'%s' for xobject '%s' of type "
"'%s' for object '%s' of type "
"'%s'.",
params->name,
obj->object,