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

Addition of daignostics for failure to add users

Browse Source
This commit is contained in:
Mark Riddoch
2013-07-23 10:46:58 +02:00
parent d536ca1c2c
commit 36f62637c9
4 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitor/galera_mon.c
View File

@ -256,7 +256,7 @@ char *uname = defaultUser, *passwd = defaultPasswd;
num_fields = mysql_num_fields(result);
while ((row = mysql_fetch_row(result)))
{
if (strncmp(row[0], "JOINED", 3) == 0)
if (strncasecmp(row[0], "JOINED", 3) == 0)
isjoined = 1;
}
mysql_free_result(result);

9
modules/routing/debugcmd.c
View File

@ -465,7 +465,8 @@ unsigned int bitvalue;
static void
reload_users(DCB *dcb, SERVICE *service)
{
dcb_printf(dcb, "Loaded %d users.\n", reload_mysql_users(service));
dcb_printf(dcb, "Loaded %d database users for server %s.\n",
reload_mysql_users(service), service->name);
}
/**
@ -490,13 +491,15 @@ reload_config(DCB *dcb)
static void
telnetdAddUser(DCB *dcb, char *user, char *passwd)
{
char *err;
if (admin_test_user(user))
{
dcb_printf(dcb, "User %s already exists.\n", user);
return;
}
if (admin_add_user(user, passwd))
if ((err = admin_add_user(user, passwd)) == NULL)
dcb_printf(dcb, "User %s has been succesfully added.\n", user);
else
dcb_printf(dcb, "Failed to add new user.\n");
dcb_printf(dcb, "Failed to add new user. %s\n", err);
}