database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-25884 Tests use environment $USER variable without quotes

Browse Source 
These are only 10.4+ tests. 10.2+ tests are pushed into 10.2
and will be merged into 10.4+ independently
This commit is contained in:
Elena Stepanova
2021-06-09 15:50:01 +03:00
parent f13b80af39
commit 0b9a59bbc4
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/main/password_expiration_unix_socket.result
View File

@ -1,8 +1,8 @@
# #
# A password cannot expire, if there is no password # A password cannot expire, if there is no password
# #
create user USER identified via unix_socket; create user 'USER' identified via unix_socket;
alter user USER password expire; alter user 'USER' password expire;
1 1
1 1
drop user USER; drop user 'USER';

18
mysql-test/main/password_expiration_unix_socket.test
View File

@ -9,16 +9,16 @@
--echo # A password cannot expire, if there is no password --echo # A password cannot expire, if there is no password
--echo # --echo #
--let $replace=create user $USER --let $replace=create user '$USER'
--replace_result $replace "create user USER" --replace_result $replace "create user 'USER'"
--eval create user $USER identified via unix_socket --eval create user '$USER' identified via unix_socket
--let $replace=alter user $USER --let $replace=alter user '$USER'
--replace_result $replace "alter user USER" --replace_result $replace "alter user 'USER'"
--eval alter user $USER password expire --eval alter user '$USER' password expire
--exec $MYSQL -u $USER -e 'select 1' --exec $MYSQL -u $USER -e 'select 1'
--let $replace=drop user $USER --let $replace=drop user '$USER'
--replace_result $replace "drop user USER" --replace_result $replace "drop user 'USER'"
--eval drop user $USER --eval drop user '$USER'

24
mysql-test/suite/plugins/r/multiauth.result
View File

@ -1,5 +1,5 @@
install soname 'auth_ed25519'; install soname 'auth_ed25519';
create user USER identified via unix_socket OR mysql_native_password as password("GOOD"); create user 'USER' identified via unix_socket OR mysql_native_password as password("GOOD");
create user mysqltest1 identified via unix_socket OR mysql_native_password as password("good"); create user mysqltest1 identified via unix_socket OR mysql_native_password as password("good");
show create user mysqltest1; show create user mysqltest1;
CREATE USER for mysqltest1@% CREATE USER for mysqltest1@%
@ -14,8 +14,8 @@ user() current_user() database()
mysqltest1@localhost mysqltest1@% test mysqltest1@localhost mysqltest1@% test
# name does not match, password bad = failure # name does not match, password bad = failure
mysqltest: Could not open connection 'default': 1045 Access denied for user 'mysqltest1'@'localhost' (using password: YES) mysqltest: Could not open connection 'default': 1045 Access denied for user 'mysqltest1'@'localhost' (using password: YES)
drop user USER, mysqltest1; drop user 'USER', mysqltest1;
create user USER identified via mysql_native_password as password("GOOD") OR unix_socket; create user 'USER' identified via mysql_native_password as password("GOOD") OR unix_socket;
create user mysqltest1 identified via mysql_native_password as password("good") OR unix_socket; create user mysqltest1 identified via mysql_native_password as password("good") OR unix_socket;
show create user mysqltest1; show create user mysqltest1;
CREATE USER for mysqltest1@% CREATE USER for mysqltest1@%
@ -30,8 +30,8 @@ user() current_user() database()
mysqltest1@localhost mysqltest1@% test mysqltest1@localhost mysqltest1@% test
# name does not match, password bad = failure # name does not match, password bad = failure
mysqltest: Could not open connection 'default': 1698 Access denied for user 'mysqltest1'@'localhost' mysqltest: Could not open connection 'default': 1698 Access denied for user 'mysqltest1'@'localhost'
drop user USER, mysqltest1; drop user 'USER', mysqltest1;
create user USER identified via unix_socket OR ed25519 as password("GOOD"); create user 'USER' identified via unix_socket OR ed25519 as password("GOOD");
create user mysqltest1 identified via unix_socket OR ed25519 as password("good"); create user mysqltest1 identified via unix_socket OR ed25519 as password("good");
show create user mysqltest1; show create user mysqltest1;
CREATE USER for mysqltest1@% CREATE USER for mysqltest1@%
@ -46,8 +46,8 @@ user() current_user() database()
mysqltest1@localhost mysqltest1@% test mysqltest1@localhost mysqltest1@% test
# name does not match, password bad = failure # name does not match, password bad = failure
mysqltest: Could not open connection 'default': 1045 Access denied for user 'mysqltest1'@'localhost' (using password: YES) mysqltest: Could not open connection 'default': 1045 Access denied for user 'mysqltest1'@'localhost' (using password: YES)
drop user USER, mysqltest1; drop user 'USER', mysqltest1;
create user USER identified via ed25519 as password("GOOD") OR unix_socket; create user 'USER' identified via ed25519 as password("GOOD") OR unix_socket;
create user mysqltest1 identified via ed25519 as password("good") OR unix_socket; create user mysqltest1 identified via ed25519 as password("good") OR unix_socket;
show create user mysqltest1; show create user mysqltest1;
CREATE USER for mysqltest1@% CREATE USER for mysqltest1@%
@ -62,8 +62,8 @@ user() current_user() database()
mysqltest1@localhost mysqltest1@% test mysqltest1@localhost mysqltest1@% test
# name does not match, password bad = failure # name does not match, password bad = failure
mysqltest: Could not open connection 'default': 1698 Access denied for user 'mysqltest1'@'localhost' mysqltest: Could not open connection 'default': 1698 Access denied for user 'mysqltest1'@'localhost'
drop user USER, mysqltest1; drop user 'USER', mysqltest1;
create user USER identified via ed25519 as password("GOOD") OR unix_socket OR mysql_native_password as password("works"); create user 'USER' identified via ed25519 as password("GOOD") OR unix_socket OR mysql_native_password as password("works");
create user mysqltest1 identified via ed25519 as password("good") OR unix_socket OR mysql_native_password as password("works"); create user mysqltest1 identified via ed25519 as password("good") OR unix_socket OR mysql_native_password as password("works");
show create user mysqltest1; show create user mysqltest1;
CREATE USER for mysqltest1@% CREATE USER for mysqltest1@%
@ -82,7 +82,7 @@ user() current_user() database()
mysqltest1@localhost mysqltest1@% test mysqltest1@localhost mysqltest1@% test
# name does not match, password bad = failure # name does not match, password bad = failure
mysqltest: Could not open connection 'default': 1045 Access denied for user 'mysqltest1'@'localhost' (using password: YES) mysqltest: Could not open connection 'default': 1045 Access denied for user 'mysqltest1'@'localhost' (using password: YES)
drop user USER, mysqltest1; drop user 'USER', mysqltest1;
create user mysqltest1 identified via mysql_native_password as password("good") OR mysql_native_password as password("works"); create user mysqltest1 identified via mysql_native_password as password("good") OR mysql_native_password as password("works");
show create user mysqltest1; show create user mysqltest1;
CREATE USER for mysqltest1@% CREATE USER for mysqltest1@%
@ -156,7 +156,7 @@ drop user mysqltest1;
create user mysqltest1 identified via ed25519 as password("good") OR unix_socket OR mysql_native_password as password("works"); create user mysqltest1 identified via ed25519 as password("good") OR unix_socket OR mysql_native_password as password("works");
ERROR HY000: Column count of mysql.user is wrong. Expected 3, found 47. Created with MariaDB XX.YY.ZZ, now running XX.YY.ZZ. Please use mysql_upgrade to fix this error ERROR HY000: Column count of mysql.user is wrong. Expected 3, found 47. Created with MariaDB XX.YY.ZZ, now running XX.YY.ZZ. Please use mysql_upgrade to fix this error
# switching back from mysql.user to mysql.global_priv # switching back from mysql.user to mysql.global_priv
create user USER identified via mysql_native_password as '1234567890123456789012345678901234567890a' OR unix_socket; create user 'USER' identified via mysql_native_password as '1234567890123456789012345678901234567890a' OR unix_socket;
create user mysqltest1 identified via mysql_native_password as '1234567890123456789012345678901234567890a' OR unix_socket; create user mysqltest1 identified via mysql_native_password as '1234567890123456789012345678901234567890a' OR unix_socket;
update mysql.global_priv set priv=replace(priv, '1234567890123456789012345678901234567890a', 'invalid password'); update mysql.global_priv set priv=replace(priv, '1234567890123456789012345678901234567890a', 'invalid password');
flush privileges; flush privileges;
@ -174,7 +174,7 @@ set password for mysqltest1 = password('bla');
select user(), current_user(), database(); select user(), current_user(), database();
user() current_user() database() user() current_user() database()
mysqltest1@localhost mysqltest1@% test mysqltest1@localhost mysqltest1@% test
drop user USER, mysqltest1; drop user 'USER', mysqltest1;
create user mysqltest1 identified via ed25519 as password("good"); create user mysqltest1 identified via ed25519 as password("good");
show create user mysqltest1; show create user mysqltest1;
CREATE USER for mysqltest1@% CREATE USER for mysqltest1@%

28
mysql-test/suite/plugins/t/multiauth.test
View File

@ -22,13 +22,13 @@ install soname 'auth_ed25519';
select user(), current_user(), database(); select user(), current_user(), database();
EOF EOF
--let $creplace=create user $USER --let $creplace=create user '$USER'
--let $dreplace=drop user $USER --let $dreplace=drop user '$USER'
# #
# socket,password # socket,password
# #
--replace_result $creplace "create user USER" --replace_result $creplace "create user 'USER'"
eval $creplace identified via unix_socket OR mysql_native_password as password("GOOD"); eval $creplace identified via unix_socket OR mysql_native_password as password("GOOD");
create user mysqltest1 identified via unix_socket OR mysql_native_password as password("good"); create user mysqltest1 identified via unix_socket OR mysql_native_password as password("good");
show create user mysqltest1; show create user mysqltest1;
@ -39,13 +39,13 @@ show create user mysqltest1;
--echo # name does not match, password bad = failure --echo # name does not match, password bad = failure
--error 1 --error 1
--exec $try_auth -u mysqltest1 -pbad --exec $try_auth -u mysqltest1 -pbad
--replace_result $dreplace "drop user USER" --replace_result $dreplace "drop user 'USER'"
eval $dreplace, mysqltest1; eval $dreplace, mysqltest1;
# #
# password,socket # password,socket
# #
--replace_result $creplace "create user USER" --replace_result $creplace "create user 'USER'"
eval $creplace identified via mysql_native_password as password("GOOD") OR unix_socket; eval $creplace identified via mysql_native_password as password("GOOD") OR unix_socket;
create user mysqltest1 identified via mysql_native_password as password("good") OR unix_socket; create user mysqltest1 identified via mysql_native_password as password("good") OR unix_socket;
show create user mysqltest1; show create user mysqltest1;
@ -56,13 +56,13 @@ show create user mysqltest1;
--echo # name does not match, password bad = failure --echo # name does not match, password bad = failure
--error 1 --error 1
--exec $try_auth -u mysqltest1 -pbad --exec $try_auth -u mysqltest1 -pbad
--replace_result $dreplace "drop user USER" --replace_result $dreplace "drop user 'USER'"
eval $dreplace, mysqltest1; eval $dreplace, mysqltest1;
# #
# socket,ed25519 # socket,ed25519
# #
--replace_result $creplace "create user USER" --replace_result $creplace "create user 'USER'"
eval $creplace identified via unix_socket OR ed25519 as password("GOOD"); eval $creplace identified via unix_socket OR ed25519 as password("GOOD");
create user mysqltest1 identified via unix_socket OR ed25519 as password("good"); create user mysqltest1 identified via unix_socket OR ed25519 as password("good");
show create user mysqltest1; show create user mysqltest1;
@ -73,13 +73,13 @@ show create user mysqltest1;
--echo # name does not match, password bad = failure --echo # name does not match, password bad = failure
--error 1 --error 1
--exec $try_auth -u mysqltest1 -pbad --exec $try_auth -u mysqltest1 -pbad
--replace_result $dreplace "drop user USER" --replace_result $dreplace "drop user 'USER'"
eval $dreplace, mysqltest1; eval $dreplace, mysqltest1;
# #
# ed25519,socket # ed25519,socket
# #
--replace_result $creplace "create user USER" --replace_result $creplace "create user 'USER'"
eval $creplace identified via ed25519 as password("GOOD") OR unix_socket; eval $creplace identified via ed25519 as password("GOOD") OR unix_socket;
create user mysqltest1 identified via ed25519 as password("good") OR unix_socket; create user mysqltest1 identified via ed25519 as password("good") OR unix_socket;
show create user mysqltest1; show create user mysqltest1;
@ -90,13 +90,13 @@ show create user mysqltest1;
--echo # name does not match, password bad = failure --echo # name does not match, password bad = failure
--error 1 --error 1
--exec $try_auth -u mysqltest1 -pbad --exec $try_auth -u mysqltest1 -pbad
--replace_result $dreplace "drop user USER" --replace_result $dreplace "drop user 'USER'"
eval $dreplace, mysqltest1; eval $dreplace, mysqltest1;
# #
# ed25519,socket,password # ed25519,socket,password
# #
--replace_result $creplace "create user USER" --replace_result $creplace "create user 'USER'"
eval $creplace identified via ed25519 as password("GOOD") OR unix_socket OR mysql_native_password as password("works"); eval $creplace identified via ed25519 as password("GOOD") OR unix_socket OR mysql_native_password as password("works");
create user mysqltest1 identified via ed25519 as password("good") OR unix_socket OR mysql_native_password as password("works"); create user mysqltest1 identified via ed25519 as password("good") OR unix_socket OR mysql_native_password as password("works");
show create user mysqltest1; show create user mysqltest1;
@ -109,7 +109,7 @@ show create user mysqltest1;
--echo # name does not match, password bad = failure --echo # name does not match, password bad = failure
--error 1 --error 1
--exec $try_auth -u mysqltest1 -pbad --exec $try_auth -u mysqltest1 -pbad
--replace_result $dreplace "drop user USER" --replace_result $dreplace "drop user 'USER'"
eval $dreplace, mysqltest1; eval $dreplace, mysqltest1;
# #
@ -158,7 +158,7 @@ create user mysqltest1 identified via ed25519 as password("good") OR unix_socket
# #
# invalid password,socket # invalid password,socket
# #
--replace_result $creplace "create user USER" --replace_result $creplace "create user 'USER'"
eval $creplace identified via mysql_native_password as '1234567890123456789012345678901234567890a' OR unix_socket; eval $creplace identified via mysql_native_password as '1234567890123456789012345678901234567890a' OR unix_socket;
create user mysqltest1 identified via mysql_native_password as '1234567890123456789012345678901234567890a' OR unix_socket; create user mysqltest1 identified via mysql_native_password as '1234567890123456789012345678901234567890a' OR unix_socket;
update mysql.global_priv set priv=replace(priv, '1234567890123456789012345678901234567890a', 'invalid password'); update mysql.global_priv set priv=replace(priv, '1234567890123456789012345678901234567890a', 'invalid password');
@ -172,7 +172,7 @@ show create user mysqltest1;
--echo # SET PASSWORD helps --echo # SET PASSWORD helps
set password for mysqltest1 = password('bla'); set password for mysqltest1 = password('bla');
--exec $try_auth -u mysqltest1 -pbla --exec $try_auth -u mysqltest1 -pbla
--replace_result $dreplace "drop user USER" --replace_result $dreplace "drop user 'USER'"
eval $dreplace, mysqltest1; eval $dreplace, mysqltest1;
# #