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

Chaged MaxScale default installation directory to /usr/local/mariadb/maxscale and MaxAdmin password to 'mariadb'.

Browse Source
This commit is contained in:
Markus Makela
2015-03-23 14:53:31 +02:00
parent 1680337f40
commit 7cfc1d3cc9
36 changed files with 148 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/filter/test/tee_recursion.sh
View File

@ -29,7 +29,7 @@ function execute_test()
function reload_conf()
{
$BINDIR/bin/maxadmin --user=admin --password=skysql reload config
$BINDIR/bin/maxadmin --user=admin --password=mariadb reload config
if [[ $? -ne 0 ]]
then
echo "Test failed: maxadmin returned a non-zero value."
@ -55,7 +55,7 @@ MAXPID=$BINDIR/log/$(ls -1 $BINDIR/log|grep maxscale)
TEST1=$SRCDIR/server/modules/filter/test/tee_recursion1.cnf
TEST2=$SRCDIR/server/modules/filter/test/tee_recursion2.cnf
$BINDIR/bin/maxadmin --user=admin --password=skysql flush logs
$BINDIR/bin/maxadmin --user=admin --password=mariadb flush logs
mv $CONF $OLDCONF
cp $TEST1 $CONF

2
server/modules/include/readwritesplit.h
View File

@ -24,7 +24,7 @@
* @verbatim
* Revision History
*
* See GitHub https://github.com/skysql/MaxScale
* See GitHub https://github.com/mariadb-corporation/MaxScale
*
* @endverbatim
*/

2
server/modules/include/schemarouter.h
View File

@ -24,7 +24,7 @@
* @verbatim
* Revision History
*
* See GitHub https://github.com/skysql/MaxScale
* See GitHub https://github.com/mariadb-corporation/MaxScale
*
* @endverbatim
*/

2
server/modules/include/shardrouter.h
View File

@ -24,7 +24,7 @@
* @verbatim
* Revision History
*
* See GitHub https://github.com/skysql/MaxScale
* See GitHub https://github.com/mariadb-corporation/MaxScale
*
* @endverbatim
*/

6
server/modules/routing/binlog/blr_file.c
View File

@ -79,7 +79,7 @@ struct dirent *dp;
if (router->binlogdir == NULL)
{
strcpy(path, "/usr/local/skysql/MaxScale");
strcpy(path, "/usr/local/mariadb/maxscale");
if ((ptr = getenv("MAXSCALE_HOME")) != NULL)
{
strncpy(path, ptr,PATH_MAX);
@ -633,7 +633,7 @@ blr_cache_response(ROUTER_INSTANCE *router, char *response, GWBUF *buf)
char path[4097], *ptr;
int fd;
strcpy(path, "/usr/local/skysql/MaxScale");
strcpy(path, "/usr/local/mariadb/maxscale");
if ((ptr = getenv("MAXSCALE_HOME")) != NULL)
{
strncpy(path, ptr, 4096);
@ -672,7 +672,7 @@ char path[4097], *ptr;
int fd;
GWBUF *buf;
strcpy(path, "/usr/local/skysql/MaxScale");
strcpy(path, "/usr/local/mariadb/maxscale");
if ((ptr = getenv("MAXSCALE_HOME")) != NULL)
{
strncpy(path, ptr, 4096);