diff options
author | Sergei Golubchik <serg@mariadb.org> | 2022-10-01 23:07:26 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2022-10-01 23:07:26 +0200 |
commit | d4f6d2f08f228778fd7744554d8b12be05b6a114 (patch) | |
tree | 2ccc39d16d3a5be27c54e03a81d2d3f75cfb9266 /mysql-test/suite/parts | |
parent | 3744b8ae3171fd423f89c64a83d3afc7e3722856 (diff) | |
parent | dd8833bff0af1b75e007e3db1d18debfb7c4a096 (diff) | |
download | mariadb-git-d4f6d2f08f228778fd7744554d8b12be05b6a114.tar.gz |
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/suite/parts')
5 files changed, 17 insertions, 17 deletions
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result index 2e31fc57dd4..aa35364b811 100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result @@ -13,7 +13,7 @@ Grants for test1@localhost GRANT USAGE ON *.* TO `test1`@`localhost` GRANT SELECT, INSERT, CREATE, DROP ON `test`.* TO `test1`@`localhost` ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table 'tp' +ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table `test`.`tp` disconnect test1; connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; USE test; @@ -83,7 +83,7 @@ Grants for test2@localhost GRANT USAGE ON *.* TO `test2`@`localhost` GRANT SELECT, INSERT, UPDATE, CREATE, DROP ON `test`.* TO `test2`@`localhost` ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp' +ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp` SELECT * FROM tp WHERE a BETWEEN 0 AND 10; a b 2 Two @@ -91,11 +91,11 @@ a b 6 Six 8 Eight ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp' +ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp` ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00; -ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp' +ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp` ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00; -ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp' +ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp` connection default; disconnect test2; DROP TABLE IF EXISTS t_10; diff --git a/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result index 2e31fc57dd4..aa35364b811 100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result @@ -13,7 +13,7 @@ Grants for test1@localhost GRANT USAGE ON *.* TO `test1`@`localhost` GRANT SELECT, INSERT, CREATE, DROP ON `test`.* TO `test1`@`localhost` ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table 'tp' +ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table `test`.`tp` disconnect test1; connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; USE test; @@ -83,7 +83,7 @@ Grants for test2@localhost GRANT USAGE ON *.* TO `test2`@`localhost` GRANT SELECT, INSERT, UPDATE, CREATE, DROP ON `test`.* TO `test2`@`localhost` ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp' +ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp` SELECT * FROM tp WHERE a BETWEEN 0 AND 10; a b 2 Two @@ -91,11 +91,11 @@ a b 6 Six 8 Eight ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp' +ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp` ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00; -ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp' +ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp` ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00; -ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp' +ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp` connection default; disconnect test2; DROP TABLE IF EXISTS t_10; diff --git a/mysql-test/suite/parts/r/partition_exch_qa_6.result b/mysql-test/suite/parts/r/partition_exch_qa_6.result index 880886b4fac..7917765c9dd 100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_6.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_6.result @@ -117,7 +117,7 @@ Grants for test2@localhost GRANT USAGE ON *.* TO `test2`@`localhost` GRANT SELECT, UPDATE, CREATE, DROP, ALTER ON `test`.* TO `test2`@`localhost` ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 'tp' +ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `test`.`tp` disconnect test2; connection default; GRANT INSERT ON test.* TO test2@localhost; @@ -129,7 +129,7 @@ Grants for test2@localhost GRANT USAGE ON *.* TO `test2`@`localhost` GRANT SELECT, INSERT, UPDATE, DROP, ALTER ON `test`.* TO `test2`@`localhost` ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00; -ERROR 42000: CREATE command denied to user 'test2'@'localhost' for table 'tsp' +ERROR 42000: CREATE command denied to user 'test2'@'localhost' for table `test`.`tsp` disconnect test2; connection default; GRANT CREATE ON test.* TO test2@localhost; @@ -140,7 +140,7 @@ Grants for test2@localhost GRANT USAGE ON *.* TO `test2`@`localhost` GRANT SELECT, INSERT, UPDATE, CREATE, ALTER ON `test`.* TO `test2`@`localhost` ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR 42000: DROP command denied to user 'test2'@'localhost' for table 'tp' +ERROR 42000: DROP command denied to user 'test2'@'localhost' for table `test`.`tp` disconnect test2; connection default; DROP TABLE IF EXISTS t_10; diff --git a/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result index 2fd45be9261..842c93ac403 100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result @@ -62,9 +62,9 @@ connection default; REVOKE INSERT ON testdb.* FROM test2@localhost; connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10; -ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 't_10' +ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`t_10` ALTER TABLE testdb.tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 'tp' +ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`tp` disconnect test2; connection default; DROP TABLE IF EXISTS t_10; diff --git a/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result index 2fd45be9261..842c93ac403 100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result @@ -62,9 +62,9 @@ connection default; REVOKE INSERT ON testdb.* FROM test2@localhost; connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10; -ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 't_10' +ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`t_10` ALTER TABLE testdb.tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 'tp' +ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`tp` disconnect test2; connection default; DROP TABLE IF EXISTS t_10; |