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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Esa Korhonen
2019-06-06 16:05:30 +03:00
parent 7a63a17278 0469d57ede
commit 799e9d67e6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/create_user.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
mysql -u root --force $1 <<EOF >& /dev/null mysql --force $1 <<EOF >& /dev/null
DROP USER IF EXISTS '$node_user'@'%'; DROP USER IF EXISTS '$node_user'@'%';
CREATE USER '$node_user'@'%' IDENTIFIED BY '$node_password'; CREATE USER '$node_user'@'%' IDENTIFIED BY '$node_password';

4
maxscale-system-test/create_user_galera.sh
View File

@ -4,14 +4,14 @@
for ((i=0;i<100;i++)) for ((i=0;i<100;i++))
do do
mysql -ss -u root $1 -e 'show status like "wsrep_ready"' | grep 'ON' && break || sleep 1 mysql -ss $1 -e 'show status like "wsrep_ready"' | grep 'ON' && break || sleep 1
done done
# The removal of the anonymous ''@'localhost' user is done in a somewhat crude # The removal of the anonymous ''@'localhost' user is done in a somewhat crude
# way. The proper way would be to do a secure installation or drop the users # way. The proper way would be to do a secure installation or drop the users
# with DROP USER statements. # with DROP USER statements.
mysql -u root --force <<EOF mysql --force <<EOF
DELETE FROM mysql.user WHERE user = ''; DELETE FROM mysql.user WHERE user = '';

4
maxscale-system-test/mariadb_nodes.cpp
View File

@ -355,7 +355,7 @@ void Mariadb_nodes::create_users(int node)
// Create users for replication as well as the users that are used by the tests // Create users for replication as well as the users that are used by the tests
sprintf(str, "%s/create_user.sh", test_dir); sprintf(str, "%s/create_user.sh", test_dir);
copy_to_node(node, str, access_homedir[node]); copy_to_node(node, str, access_homedir[node]);
ssh_node_f(node, false, ssh_node_f(node, true,
"export node_user=\"%s\"; export node_password=\"%s\"; %s/create_user.sh %s", "export node_user=\"%s\"; export node_password=\"%s\"; %s/create_user.sh %s",
user_name, password, access_homedir[0], socket_cmd[0]); user_name, password, access_homedir[0], socket_cmd[0]);
} }
@ -465,7 +465,7 @@ int Galera_nodes::start_galera()
copy_to_node_legacy(str, "~/", 0); copy_to_node_legacy(str, "~/", 0);
ssh_node_f(0, ssh_node_f(0,
false, true,
"export galera_user=\"%s\"; export galera_password=\"%s\"; ./create_user_galera.sh %s", "export galera_user=\"%s\"; export galera_password=\"%s\"; ./create_user_galera.sh %s",
user_name, user_name,
password, password,