Skip to content

M
mariadb
Commit 4f22919f authored by Sergey Petrunya's avatar Sergey Petrunya
Browse files
Options

More trivial test results updates

parent 928b21a9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 117 deletions
mysql-test/suite/funcs_1/r/innodb_trig_0102.result
View file @ 4f22919f
...@@ -185,7 +185,7 @@ Testcase 3.5.1.7: - need to fix ...@@ -185,7 +185,7 @@ Testcase 3.5.1.7: - need to fix
------------------------------- -------------------------------
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
create table t1 (f1 int, f2 char(25),f3 int) engine = <engine_to_be_used>; create table t1 (f1 int, f2 char(25),f3 int) engine = <engine_to_be_used>;
CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1 CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
for each row set new.f3 = '14'; for each row set new.f3 = '14';
......
mysql-test/suite/funcs_1/r/is_statistics.result
View file @ 4f22919f
...@@ -114,7 +114,6 @@ def mysql index_stats mysql PRIMARY ...@@ -114,7 +114,6 @@ def mysql index_stats mysql PRIMARY
def mysql index_stats mysql PRIMARY def mysql index_stats mysql PRIMARY
def mysql index_stats mysql PRIMARY def mysql index_stats mysql PRIMARY
def mysql index_stats mysql PRIMARY def mysql index_stats mysql PRIMARY
def mysql ndb_binlog_index mysql PRIMARY
def mysql plugin mysql PRIMARY def mysql plugin mysql PRIMARY
def mysql proc mysql PRIMARY def mysql proc mysql PRIMARY
def mysql proc mysql PRIMARY def mysql proc mysql PRIMARY
...@@ -131,10 +130,6 @@ def mysql proxies_priv mysql PRIMARY ...@@ -131,10 +130,6 @@ def mysql proxies_priv mysql PRIMARY
def mysql proxies_priv mysql PRIMARY def mysql proxies_priv mysql PRIMARY
def mysql proxies_priv mysql Grantor def mysql proxies_priv mysql Grantor
def mysql servers mysql PRIMARY def mysql servers mysql PRIMARY
def mysql slave_master_info mysql PRIMARY
def mysql slave_relay_log_info mysql PRIMARY
def mysql slave_worker_info mysql PRIMARY
def mysql slave_worker_info mysql PRIMARY
def mysql table_stats mysql PRIMARY def mysql table_stats mysql PRIMARY
def mysql table_stats mysql PRIMARY def mysql table_stats mysql PRIMARY
def mysql tables_priv mysql PRIMARY def mysql tables_priv mysql PRIMARY
......
mysql-test/suite/funcs_1/r/is_statistics_mysql.result
View file @ 4f22919f
...@@ -42,7 +42,6 @@ def mysql innodb_index_stats 0 mysql PRIMARY 3 index_name A #CARD# NULL NULL BT ...@@ -42,7 +42,6 @@ def mysql innodb_index_stats 0 mysql PRIMARY 3 index_name A #CARD# NULL NULL BT
def mysql innodb_index_stats 0 mysql PRIMARY 4 stat_name A #CARD# NULL NULL BTREE def mysql innodb_index_stats 0 mysql PRIMARY 4 stat_name A #CARD# NULL NULL BTREE
def mysql innodb_table_stats 0 mysql PRIMARY 1 database_name A #CARD# NULL NULL BTREE def mysql innodb_table_stats 0 mysql PRIMARY 1 database_name A #CARD# NULL NULL BTREE
def mysql innodb_table_stats 0 mysql PRIMARY 2 table_name A #CARD# NULL NULL BTREE def mysql innodb_table_stats 0 mysql PRIMARY 2 table_name A #CARD# NULL NULL BTREE
def mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A #CARD# NULL NULL BTREE
def mysql plugin 0 mysql PRIMARY 1 name A #CARD# NULL NULL BTREE def mysql plugin 0 mysql PRIMARY 1 name A #CARD# NULL NULL BTREE
def mysql proc 0 mysql PRIMARY 1 db A #CARD# NULL NULL BTREE def mysql proc 0 mysql PRIMARY 1 db A #CARD# NULL NULL BTREE
def mysql proc 0 mysql PRIMARY 2 name A #CARD# NULL NULL BTREE def mysql proc 0 mysql PRIMARY 2 name A #CARD# NULL NULL BTREE
...@@ -59,10 +58,6 @@ def mysql proxies_priv 0 mysql PRIMARY 2 User A #CARD# NULL NULL BTREE ...@@ -59,10 +58,6 @@ def mysql proxies_priv 0 mysql PRIMARY 2 User A #CARD# NULL NULL BTREE
def mysql proxies_priv 0 mysql PRIMARY 3 Proxied_host A #CARD# NULL NULL BTREE def mysql proxies_priv 0 mysql PRIMARY 3 Proxied_host A #CARD# NULL NULL BTREE
def mysql proxies_priv 0 mysql PRIMARY 4 Proxied_user A #CARD# NULL NULL BTREE def mysql proxies_priv 0 mysql PRIMARY 4 Proxied_user A #CARD# NULL NULL BTREE
def mysql servers 0 mysql PRIMARY 1 Server_name A #CARD# NULL NULL BTREE def mysql servers 0 mysql PRIMARY 1 Server_name A #CARD# NULL NULL BTREE
def mysql slave_master_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE
def mysql slave_relay_log_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE
def mysql slave_worker_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE
def mysql slave_worker_info 0 mysql PRIMARY 2 Worker_id A #CARD# NULL NULL BTREE
def mysql tables_priv 1 mysql Grantor 1 Grantor A #CARD# NULL NULL BTREE def mysql tables_priv 1 mysql Grantor 1 Grantor A #CARD# NULL NULL BTREE
def mysql tables_priv 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE def mysql tables_priv 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE
def mysql tables_priv 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE def mysql tables_priv 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE
......
mysql-test/suite/funcs_1/r/is_user_privileges.result
View file @ 4f22919f
...@@ -129,6 +129,7 @@ max_connections 0 ...@@ -129,6 +129,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser2 User testuser2
Password Password
...@@ -171,6 +172,7 @@ max_connections 0 ...@@ -171,6 +172,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser3 User testuser3
Password Password
...@@ -213,6 +215,7 @@ max_connections 0 ...@@ -213,6 +215,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
# #
# Add GRANT OPTION db_datadict.* to testuser1; # Add GRANT OPTION db_datadict.* to testuser1;
GRANT UPDATE ON db_datadict.* TO 'testuser1'@'localhost' WITH GRANT OPTION; GRANT UPDATE ON db_datadict.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
...@@ -279,6 +282,7 @@ max_connections 0 ...@@ -279,6 +282,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser2 User testuser2
Password Password
...@@ -321,6 +325,7 @@ max_connections 0 ...@@ -321,6 +325,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser3 User testuser3
Password Password
...@@ -363,6 +368,7 @@ max_connections 0 ...@@ -363,6 +368,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
# Establish connection testuser1 (user=testuser1) # Establish connection testuser1 (user=testuser1)
SELECT * FROM information_schema.user_privileges SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%''' WHERE grantee LIKE '''testuser%'''
...@@ -415,6 +421,7 @@ max_connections 0 ...@@ -415,6 +421,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser2 User testuser2
Password Password
...@@ -457,6 +464,7 @@ max_connections 0 ...@@ -457,6 +464,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser3 User testuser3
Password Password
...@@ -499,6 +507,7 @@ max_connections 0 ...@@ -499,6 +507,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
SHOW GRANTS; SHOW GRANTS;
Grants for testuser1@localhost Grants for testuser1@localhost
GRANT USAGE ON *.* TO 'testuser1'@'localhost' GRANT USAGE ON *.* TO 'testuser1'@'localhost'
...@@ -573,6 +582,7 @@ max_connections 0 ...@@ -573,6 +582,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser2 User testuser2
Password Password
...@@ -615,6 +625,7 @@ max_connections 0 ...@@ -615,6 +625,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser3 User testuser3
Password Password
...@@ -657,6 +668,7 @@ max_connections 0 ...@@ -657,6 +668,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION; GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
# #
# Here <SELECT YES> is shown correctly for testuser1; # Here <SELECT YES> is shown correctly for testuser1;
...@@ -723,6 +735,7 @@ max_connections 0 ...@@ -723,6 +735,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser2 User testuser2
Password Password
...@@ -765,6 +778,7 @@ max_connections 0 ...@@ -765,6 +778,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser3 User testuser3
Password Password
...@@ -807,6 +821,7 @@ max_connections 0 ...@@ -807,6 +821,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
# Switch to connection testuser1 # Switch to connection testuser1
SELECT * FROM information_schema.user_privileges SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%''' WHERE grantee LIKE '''testuser%'''
...@@ -859,6 +874,7 @@ max_connections 0 ...@@ -859,6 +874,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser2 User testuser2
Password Password
...@@ -901,6 +917,7 @@ max_connections 0 ...@@ -901,6 +917,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser3 User testuser3
Password Password
...@@ -943,6 +960,7 @@ max_connections 0 ...@@ -943,6 +960,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
SHOW GRANTS; SHOW GRANTS;
Grants for testuser1@localhost Grants for testuser1@localhost
GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION
...@@ -1047,6 +1065,7 @@ max_connections 0 ...@@ -1047,6 +1065,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser2 User testuser2
Password Password
...@@ -1089,6 +1108,7 @@ max_connections 0 ...@@ -1089,6 +1108,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser3 User testuser3
Password Password
...@@ -1131,6 +1151,7 @@ max_connections 0 ...@@ -1131,6 +1151,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
# Switch to connection testuser1 # Switch to connection testuser1
SELECT * FROM information_schema.user_privileges SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%''' WHERE grantee LIKE '''testuser%'''
...@@ -1230,6 +1251,7 @@ max_connections 0 ...@@ -1230,6 +1251,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser2 User testuser2
Password Password
...@@ -1272,6 +1294,7 @@ max_connections 0 ...@@ -1272,6 +1294,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser3 User testuser3
Password Password
...@@ -1314,6 +1337,7 @@ max_connections 0 ...@@ -1314,6 +1337,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
# Switch to connection testuser1 # Switch to connection testuser1
SELECT * FROM information_schema.user_privileges SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%''' WHERE grantee LIKE '''testuser%'''
...@@ -1366,6 +1390,7 @@ max_connections 0 ...@@ -1366,6 +1390,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser2 User testuser2
Password Password
...@@ -1408,6 +1433,7 @@ max_connections 0 ...@@ -1408,6 +1433,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser3 User testuser3
Password Password
...@@ -1450,6 +1476,7 @@ max_connections 0 ...@@ -1450,6 +1476,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
SHOW GRANTS; SHOW GRANTS;
Grants for testuser1@localhost Grants for testuser1@localhost
GRANT USAGE ON *.* TO 'testuser1'@'localhost' GRANT USAGE ON *.* TO 'testuser1'@'localhost'
...@@ -1509,6 +1536,7 @@ max_connections 0 ...@@ -1509,6 +1536,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser2 User testuser2
Password Password
...@@ -1551,6 +1579,7 @@ max_connections 0 ...@@ -1551,6 +1579,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser3 User testuser3
Password Password
...@@ -1593,6 +1622,7 @@ max_connections 0 ...@@ -1593,6 +1622,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
SHOW GRANTS; SHOW GRANTS;
Grants for testuser1@localhost Grants for testuser1@localhost
GRANT USAGE ON *.* TO 'testuser1'@'localhost' GRANT USAGE ON *.* TO 'testuser1'@'localhost'
...@@ -1667,6 +1697,7 @@ max_connections 0 ...@@ -1667,6 +1697,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser2 User testuser2
Password Password
...@@ -1709,6 +1740,7 @@ max_connections 0 ...@@ -1709,6 +1740,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
Host localhost Host localhost
User testuser3 User testuser3
Password Password
...@@ -1751,6 +1783,7 @@ max_connections 0 ...@@ -1751,6 +1783,7 @@ max_connections 0
max_user_connections 0 max_user_connections 0
plugin plugin
authentication_string authentication_string
password_expired N
# Switch to connection testuser1 # Switch to connection testuser1
SELECT * FROM information_schema.user_privileges SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%''' WHERE grantee LIKE '''testuser%'''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7