more test fixesbb-10.10-no_hack-2

15 files changed, 30 insertions, 5 deletions

diff --git a/mysql-test/suite/galera/r/galera_create_procedure.result b/mysql-test/suite/galera/r/galera_create_procedure.result
index 24a0bd66b39..27bdf19f256 100644
--- a/mysql-test/suite/galera/r/galera_create_procedure.result
+++ b/mysql-test/suite/galera/r/galera_create_procedure.result
@@ -2,6 +2,7 @@ connection node_2;
 connection node_1;
 connection node_1;
 CREATE USER 'user1';
+GRANT ALL ON test.* to 'user1';
 CREATE TABLE t1 (f1 INTEGER);
 CREATE
 DEFINER = 'user1'
diff --git a/mysql-test/suite/galera/r/galera_create_trigger.result b/mysql-test/suite/galera/r/galera_create_trigger.result
index 56b35150d87..4244e4c85ad 100644
--- a/mysql-test/suite/galera/r/galera_create_trigger.result
+++ b/mysql-test/suite/galera/r/galera_create_trigger.result
@@ -5,6 +5,7 @@ CREATE TABLE definer_user (f1 INTEGER, trigger_user VARCHAR(100)) ENGINE=InnoDB;
 CREATE TABLE definer_current_user (f1 INTEGER, trigger_user VARCHAR(100)) ENGINE=InnoDB;
 CREATE TABLE definer_default (f1 INTEGER, trigger_user VARCHAR(100)) ENGINE=InnoDB;
 CREATE USER 'user1';
+GRANT ALL ON test.* to 'user1';
 CREATE DEFINER=root@localhost TRIGGER definer_root BEFORE INSERT ON definer_root FOR EACH ROW SET NEW.trigger_user = CURRENT_USER();
 CREATE DEFINER=user1 TRIGGER definer_user BEFORE INSERT ON definer_user FOR EACH ROW SET NEW.trigger_user = CURRENT_USER();
 CREATE DEFINER=current_user TRIGGER definer_current_user BEFORE INSERT ON definer_current_user FOR EACH ROW SET NEW.trigger_user = CURRENT_USER();
diff --git a/mysql-test/suite/galera/r/galera_read_only.result b/mysql-test/suite/galera/r/galera_read_only.result
index e7e18ca8145..0928c62f23b 100644
--- a/mysql-test/suite/galera/r/galera_read_only.result
+++ b/mysql-test/suite/galera/r/galera_read_only.result
@@ -10,6 +10,7 @@ SELECT COUNT(*) = 1 FROM t1;
 COUNT(*) = 1
 1
 CREATE USER foo@localhost;
+GRANT ALL ON test.* to foo@localhost;
 # Open connection to node 2 using 'foo' user.
 connect foo_node_2,127.0.0.1,foo,,test,$port_2,;
 
diff --git a/mysql-test/suite/galera/r/galera_roles.result b/mysql-test/suite/galera/r/galera_roles.result
index 35487185db2..a9936413ace 100644
--- a/mysql-test/suite/galera/r/galera_roles.result
+++ b/mysql-test/suite/galera/r/galera_roles.result
@@ -21,8 +21,8 @@ GRANT EXECUTE ON PROCEDURE test1.pr1 TO role1;
 GRANT SELECT ON test1.t1 TO role1;
 GRANT SELECT (a) ON test1.t2 TO role1;
 # Open connections to the 2 nodes using 'foo' user.
-connect foo_node_1,127.0.0.1,foo,,test,$port_1,;
-connect foo_node_2,127.0.0.1,foo,,test,$port_2,;
+connect foo_node_1,127.0.0.1,foo,,"*NO-ONE*",$port_1,;
+connect foo_node_2,127.0.0.1,foo,,"*NO-ONE*",$port_2,;
 
 # Connect with foo_node_1
 connection foo_node_1;
diff --git a/mysql-test/suite/galera/t/galera_create_procedure.test b/mysql-test/suite/galera/t/galera_create_procedure.test
index 30bc85fcea0..4947a446e9e 100644
--- a/mysql-test/suite/galera/t/galera_create_procedure.test
+++ b/mysql-test/suite/galera/t/galera_create_procedure.test
@@ -7,6 +7,7 @@
 
 --connection node_1
 CREATE USER 'user1';
+GRANT ALL ON test.* to 'user1';
 CREATE TABLE t1 (f1 INTEGER);
 
 CREATE
diff --git a/mysql-test/suite/galera/t/galera_create_trigger.test b/mysql-test/suite/galera/t/galera_create_trigger.test
index 6708e30bf0f..c76981aae29 100644
--- a/mysql-test/suite/galera/t/galera_create_trigger.test
+++ b/mysql-test/suite/galera/t/galera_create_trigger.test
@@ -11,6 +11,7 @@ CREATE TABLE definer_current_user (f1 INTEGER, trigger_user VARCHAR(100)) ENGINE
 CREATE TABLE definer_default (f1 INTEGER, trigger_user VARCHAR(100)) ENGINE=InnoDB;
 
 CREATE USER 'user1';
+GRANT ALL ON test.* to 'user1';
 CREATE DEFINER=root@localhost TRIGGER definer_root BEFORE INSERT ON definer_root FOR EACH ROW SET NEW.trigger_user = CURRENT_USER();
 CREATE DEFINER=user1 TRIGGER definer_user BEFORE INSERT ON definer_user FOR EACH ROW SET NEW.trigger_user = CURRENT_USER();
 CREATE DEFINER=current_user TRIGGER definer_current_user BEFORE INSERT ON definer_current_user FOR EACH ROW SET NEW.trigger_user = CURRENT_USER();
diff --git a/mysql-test/suite/galera/t/galera_read_only.test b/mysql-test/suite/galera/t/galera_read_only.test
index 56fe2fdd910..8d8a8cf88aa 100644
--- a/mysql-test/suite/galera/t/galera_read_only.test
+++ b/mysql-test/suite/galera/t/galera_read_only.test
@@ -18,6 +18,7 @@ INSERT INTO t1 VALUES (1);
 SELECT COUNT(*) = 1 FROM t1;
 
 CREATE USER foo@localhost;
+GRANT ALL ON test.* to foo@localhost;
 
 --echo # Open connection to node 2 using 'foo' user.
 --let $port_2= \$NODE_MYPORT_2
diff --git a/mysql-test/suite/galera/t/galera_roles.test b/mysql-test/suite/galera/t/galera_roles.test
index 3005562db9c..e71ca42f2d8 100644
--- a/mysql-test/suite/galera/t/galera_roles.test
+++ b/mysql-test/suite/galera/t/galera_roles.test
@@ -33,11 +33,11 @@ GRANT SELECT (a) ON test1.t2 TO role1;
 
 --echo # Open connections to the 2 nodes using 'foo' user.
 --let $port_1= \$NODE_MYPORT_1
---connect(foo_node_1,127.0.0.1,foo,,test,$port_1,)
+--connect(foo_node_1,127.0.0.1,foo,,"*NO-ONE*",$port_1,)
 
 --let $port_2= \$NODE_MYPORT_2
 --sleep 1
---connect(foo_node_2,127.0.0.1,foo,,test,$port_2,)
+--connect(foo_node_2,127.0.0.1,foo,,"*NO-ONE*",$port_2,)
 
 --echo
 --echo # Connect with foo_node_1
diff --git a/mysql-test/suite/plugins/r/pam.result b/mysql-test/suite/plugins/r/pam.result
index b8588916169..ceb81690cd8 100644
--- a/mysql-test/suite/plugins/r/pam.result
+++ b/mysql-test/suite/plugins/r/pam.result
@@ -1,6 +1,8 @@
 install plugin pam soname 'auth_pam.so';
 create user test_pam identified via pam using 'mariadb_mtr';
+grant all on test.* to test_pam;
 create user pam_test;
+grant all on test.* to pam_test;
 grant proxy on pam_test to test_pam;
 #
 # athentication is successful, challenge/pin are ok
@@ -72,6 +74,7 @@ select user(), current_user(), database();
 drop user test_pam;
 drop user pam_test;
 create user PAM_TEST identified via pam using 'mariadb_mtr';
+grant all on test.* to PAM_TEST;
 #
 # athentication is unsuccessful
 #
@@ -95,6 +98,7 @@ drop user PAM_TEST;
 # MDEV-27341 Use SET PASSWORD to change PAM service
 #
 create user pam_test identified via pam using 'mariadb_mtr';
+grant all on test.* to pam_test;
 Challenge input first.
 Enter: *************************
 Now, the magic number!
diff --git a/mysql-test/suite/plugins/r/pam_cleartext.result b/mysql-test/suite/plugins/r/pam_cleartext.result
index 07c379a4b7f..6a4d21edbf2 100644
--- a/mysql-test/suite/plugins/r/pam_cleartext.result
+++ b/mysql-test/suite/plugins/r/pam_cleartext.result
@@ -1,6 +1,8 @@
 install plugin pam soname 'auth_pam.so';
 create user test_pam identified via pam using 'mariadb_mtr';
+grant all on test.* to test_pam;
 create user pam_test;
+grant all on test.* to pam_test;
 grant proxy on pam_test to test_pam;
 show variables like 'pam_use_%';
 Variable_name	Value
diff --git a/mysql-test/suite/plugins/r/pam_v1.result b/mysql-test/suite/plugins/r/pam_v1.result
index 66776e3bca7..c90d17188d6 100644
--- a/mysql-test/suite/plugins/r/pam_v1.result
+++ b/mysql-test/suite/plugins/r/pam_v1.result
@@ -1,6 +1,8 @@
 install plugin pam soname 'auth_pam_v1.so';
 create user test_pam identified via pam using 'mariadb_mtr';
+grant all on test.* to test_pam;
 create user pam_test;
+grant all on test.* to pam_test;
 grant proxy on pam_test to test_pam;
 #
 # athentication is successful, challenge/pin are ok
diff --git a/mysql-test/suite/plugins/t/pam.test b/mysql-test/suite/plugins/t/pam.test
index dbe108d1efa..c953e05fa68 100644
--- a/mysql-test/suite/plugins/t/pam.test
+++ b/mysql-test/suite/plugins/t/pam.test
@@ -86,6 +86,7 @@ alter user test_pam password expire;
 drop user test_pam;
 drop user pam_test;
 create user PAM_TEST identified via pam using 'mariadb_mtr';
+grant all on test.* to PAM_TEST;
 
 --echo #
 --echo # athentication is unsuccessful
@@ -109,6 +110,7 @@ drop user PAM_TEST;
 --echo # MDEV-27341 Use SET PASSWORD to change PAM service
 --echo #
 create user pam_test identified via pam using 'mariadb_mtr';
+grant all on test.* to pam_test;
 --write_file $MYSQLTEST_VARDIR/tmp/setpwd.txt
 not very secret challenge
 9225
diff --git a/mysql-test/suite/plugins/t/pam_init.inc b/mysql-test/suite/plugins/t/pam_init.inc
index 131b787f6b9..f3a948421ed 100644
--- a/mysql-test/suite/plugins/t/pam_init.inc
+++ b/mysql-test/suite/plugins/t/pam_init.inc
@@ -7,7 +7,9 @@ if (!$PAM_PLUGIN_VERSION) {
 
 eval install plugin pam soname '$PAM_PLUGIN_VERSION';
 create user test_pam identified via pam using 'mariadb_mtr';
+grant all on test.* to test_pam;
 create user pam_test;
+grant all on test.* to pam_test;
 grant proxy on pam_test to test_pam;
 
 let $plugindir=`SELECT @@global.plugin_dir`;
diff --git a/mysql-test/suite/roles/recursive.result b/mysql-test/suite/roles/recursive.result
index 0d45a0e03d0..b4d42ea7462 100644
--- a/mysql-test/suite/roles/recursive.result
+++ b/mysql-test/suite/roles/recursive.result
@@ -1,4 +1,5 @@
 create user foo@localhost;
+grant select on test.* to foo@localhost;
 create role role1;
 create role role2;
 create role role3;
@@ -26,6 +27,7 @@ ERROR HY000: Cannot grant role 'role10' to: 'role2'
 connect  foo, localhost, foo;
 show grants;
 Grants for foo@localhost
+GRANT SELECT ON `test`.* TO `foo`@`localhost`
 GRANT USAGE ON *.* TO `foo`@`localhost`
 GRANT `role10` TO `foo`@`localhost`
 select * from information_schema.applicable_roles;
@@ -57,6 +59,7 @@ count(*)
 show grants;
 Grants for foo@localhost
 GRANT SELECT ON *.* TO `role1`
+GRANT SELECT ON `test`.* TO `foo`@`localhost`
 GRANT USAGE ON *.* TO `foo`@`localhost`
 GRANT USAGE ON *.* TO `role10`
 GRANT USAGE ON *.* TO `role2`
@@ -115,6 +118,7 @@ count(*)
 show grants;
 Grants for foo@localhost
 GRANT SELECT ON `mysql`.* TO `role1`
+GRANT SELECT ON `test`.* TO `foo`@`localhost`
 GRANT USAGE ON *.* TO `foo`@`localhost`
 GRANT USAGE ON *.* TO `role10`
 GRANT USAGE ON *.* TO `role1`
@@ -158,6 +162,7 @@ count(*)
 show grants;
 Grants for foo@localhost
 GRANT SELECT ON `mysql`.`roles_mapping` TO `role1`
+GRANT SELECT ON `test`.* TO `foo`@`localhost`
 GRANT USAGE ON *.* TO `foo`@`localhost`
 GRANT USAGE ON *.* TO `role10`
 GRANT USAGE ON *.* TO `role1`
@@ -203,6 +208,7 @@ count(concat(User))
 show grants;
 Grants for foo@localhost
 GRANT SELECT (User) ON `mysql`.`roles_mapping` TO `role1`
+GRANT SELECT ON `test`.* TO `foo`@`localhost`
 GRANT USAGE ON *.* TO `foo`@`localhost`
 GRANT USAGE ON *.* TO `role10`
 GRANT USAGE ON *.* TO `role1`
@@ -238,6 +244,7 @@ show grants;
 Grants for foo@localhost
 GRANT SELECT (Host) ON `mysql`.`roles_mapping` TO `role3`
 GRANT SELECT (User) ON `mysql`.`roles_mapping` TO `role1`
+GRANT SELECT ON `test`.* TO `foo`@`localhost`
 GRANT USAGE ON *.* TO `foo`@`localhost`
 GRANT USAGE ON *.* TO `role10`
 GRANT USAGE ON *.* TO `role1`
diff --git a/mysql-test/suite/versioning/r/rpl_row.result b/mysql-test/suite/versioning/r/rpl_row.result
index 1b7282c8380..ab96268f5a6 100644
--- a/mysql-test/suite/versioning/r/rpl_row.result
+++ b/mysql-test/suite/versioning/r/rpl_row.result
@@ -70,6 +70,7 @@ a
 4
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000002	#	Binlog_checkpoint	#	#	master-bin.000002
 master-bin.000002	#	Gtid	#	#	GTID #-#-#
 master-bin.000002	#	Query	#	#	use `test`; create table t1 (a int) with system versioning
 partition by system_time limit 1 auto
@@ -84,7 +85,6 @@ master-bin.000002	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000002	#	Update_rows_v1	#	#	table_id: #
 master-bin.000002	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000002	#	Query	#	#	COMMIT
-master-bin.000002	#	Binlog_checkpoint	#	#	master-bin.000002
 master-bin.000002	#	Gtid	#	#	BEGIN GTID #-#-#
 master-bin.000002	#	Annotate_rows	#	#	update t1 set a= a + 2
 master-bin.000002	#	Table_map	#	#	table_id: # (test.t1)