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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2019-05-17 14:10:28 +03:00
parent bf63698991 ca682a5b1c
commit f94355770f
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maxscale-system-test/testconnections.cpp
View File

@ -476,6 +476,20 @@ TestConnections::TestConnections(int argc, char* argv[])
} }
} }
if (mdbci_call_needed)
{
int ec;
char * ver = maxscales->ssh_node_output(0, "maxscale --version-full", false, &ec);
if (ec)
{
tprintf("Error retrival of Maxscale version info");
}
else
{
tprintf("Maxscale_full_version_start:\n%s\nMaxscale_full_version_end\n", ver);
}
}
char str[1024]; char str[1024];
sprintf(str, "mkdir -p LOGS/%s", test_name); sprintf(str, "mkdir -p LOGS/%s", test_name);
system(str); system(str);

8
server/modules/authenticator/MySQLAuth/dbusers.cc
View File

@ -63,12 +63,14 @@ const char* mariadb_102_users_query =
" u.is_role, u.default_role" " u.is_role, u.default_role"
" FROM mysql.user AS u LEFT JOIN mysql.db AS d " " FROM mysql.user AS u LEFT JOIN mysql.db AS d "
" ON (u.user = d.user AND u.host = d.host) " " ON (u.user = d.user AND u.host = d.host) "
" WHERE u.plugin IN ('', 'mysql_native_password') "
" UNION " " UNION "
" SELECT u.user, u.host, t.db, u.select_priv, " " SELECT u.user, u.host, t.db, u.select_priv, "
" IF(u.password <> '', u.password, u.authentication_string), " " IF(u.password <> '', u.password, u.authentication_string), "
" u.is_role, u.default_role " " u.is_role, u.default_role "
" FROM mysql.user AS u LEFT JOIN mysql.tables_priv AS t " " FROM mysql.user AS u LEFT JOIN mysql.tables_priv AS t "
" ON (u.user = t.user AND u.host = t.host)" " ON (u.user = t.user AND u.host = t.host)"
" WHERE u.plugin IN ('', 'mysql_native_password') "
"), users AS (" "), users AS ("
// Select the root row, the actual user // Select the root row, the actual user
" SELECT t.user, t.host, t.db, t.select_priv, t.password, t.default_role AS role FROM t" " SELECT t.user, t.host, t.db, t.select_priv, t.password, t.default_role AS role FROM t"
@ -91,10 +93,12 @@ const char* mariadb_users_query
" SELECT u.user, u.host, d.db, u.select_priv, u.password AS password, u.is_role " " SELECT u.user, u.host, d.db, u.select_priv, u.password AS password, u.is_role "
" FROM mysql.user AS u LEFT JOIN mysql.db AS d " " FROM mysql.user AS u LEFT JOIN mysql.db AS d "
" ON (u.user = d.user AND u.host = d.host) " " ON (u.user = d.user AND u.host = d.host) "
" WHERE u.plugin IN ('', 'mysql_native_password') "
" UNION " " UNION "
" SELECT u.user, u.host, t.db, u.select_priv, u.password AS password, u.is_role " " SELECT u.user, u.host, t.db, u.select_priv, u.password AS password, u.is_role "
" FROM mysql.user AS u LEFT JOIN mysql.tables_priv AS t " " FROM mysql.user AS u LEFT JOIN mysql.tables_priv AS t "
" ON (u.user = t.user AND u.host = t.host) " " ON (u.user = t.user AND u.host = t.host) "
" WHERE u.plugin IN ('', 'mysql_native_password') "
") AS t " ") AS t "
// Discard any users that are roles // Discard any users that are roles
"WHERE t.is_role <> 'Y' %s " "WHERE t.is_role <> 'Y' %s "
@ -105,10 +109,12 @@ const char* mariadb_users_query
" SELECT u.user, u.host, d.db, u.select_priv, u.password AS password, u.default_role " " SELECT u.user, u.host, d.db, u.select_priv, u.password AS password, u.default_role "
" FROM mysql.user AS u LEFT JOIN mysql.db AS d " " FROM mysql.user AS u LEFT JOIN mysql.db AS d "
" ON (u.user = d.user AND u.host = d.host) " " ON (u.user = d.user AND u.host = d.host) "
" WHERE u.plugin IN ('', 'mysql_native_password') "
" UNION " " UNION "
" SELECT u.user, u.host, t.db, u.select_priv, u.password AS password, u.default_role " " SELECT u.user, u.host, t.db, u.select_priv, u.password AS password, u.default_role "
" FROM mysql.user AS u LEFT JOIN mysql.tables_priv AS t " " FROM mysql.user AS u LEFT JOIN mysql.tables_priv AS t "
" ON (u.user = t.user AND u.host = t.host) " " ON (u.user = t.user AND u.host = t.host) "
" WHERE u.plugin IN ('', 'mysql_native_password') "
") AS t " ") AS t "
// Join it to the roles_mapping table to only have users with roles // Join it to the roles_mapping table to only have users with roles
"JOIN mysql.roles_mapping AS r " "JOIN mysql.roles_mapping AS r "
@ -119,10 +125,12 @@ const char* mariadb_users_query
" SELECT u.user, u.host, d.db, u.select_priv, u.password AS password, u.is_role " " SELECT u.user, u.host, d.db, u.select_priv, u.password AS password, u.is_role "
" FROM mysql.user AS u LEFT JOIN mysql.db AS d " " FROM mysql.user AS u LEFT JOIN mysql.db AS d "
" ON (u.user = d.user AND u.host = d.host) " " ON (u.user = d.user AND u.host = d.host) "
" WHERE u.plugin IN ('', 'mysql_native_password') "
" UNION " " UNION "
" SELECT u.user, u.host, t.db, u.select_priv, u.password AS password, u.is_role " " SELECT u.user, u.host, t.db, u.select_priv, u.password AS password, u.is_role "
" FROM mysql.user AS u LEFT JOIN mysql.tables_priv AS t " " FROM mysql.user AS u LEFT JOIN mysql.tables_priv AS t "
" ON (u.user = t.user AND u.host = t.host) " " ON (u.user = t.user AND u.host = t.host) "
" WHERE u.plugin IN ('', 'mysql_native_password') "
") AS u " ") AS u "
"ON (u.user = r.role AND u.is_role = 'Y') " "ON (u.user = r.role AND u.is_role = 'Y') "
// We only care about users that have a default role assigned // We only care about users that have a default role assigned