From 57221d3d086bf8553d618ff7700bb3a7db0edb8f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Mar 2005 17:17:46 -0800 Subject: Eliminate most of the remaining hardcoded list of tests to skip by adding check for embedded server within tests and splitting some tests into multiple test files. mysql-test/mysql-test-run.sh: Remove most of hardcoded list of tests to skip mysql-test/r/ps_1general.result: Update results mysql-test/r/timezone2.result: Update results mysql-test/r/user_var.result: Update results mysql-test/r/variables.result: Update results mysql-test/t/mix_innodb_myisam_binlog.test: Disable test with embedded server mysql-test/t/mysql_protocols.test: Disable test with embedded server mysql-test/t/mysqlbinlog.test: Disable test with embedded server mysql-test/t/mysqlbinlog2.test: Disable test with embedded server mysql-test/t/mysqldump.test: Disable test with embedded server mysql-test/t/packet.test: Disable test with embedded server mysql-test/t/ps_1general.test: Move parts of test to new ps_grant mysql-test/t/rename.test: Disable test with embedded server mysql-test/t/show_check.test: Disable test with embedded server mysql-test/t/system_mysql_db_fix.test: Disable test with embedded server mysql-test/t/timezone2.test: Move part of test to timezone_grant mysql-test/t/user_var.test: Move part of test to new user_var-binlog mysql-test/t/variables.test: Move part of test to rpl_variables --- mysql-test/r/ps_1general.result | 82 ----------------------------------------- 1 file changed, 82 deletions(-) (limited to 'mysql-test/r/ps_1general.result') diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index 2356989eaf6..c17890d3e32 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -288,10 +288,6 @@ Variable_name Value sql_mode prepare stmt4 from ' show engine bdb logs '; execute stmt4; -prepare stmt4 from ' show full processlist '; -execute stmt4; -Id User Host db Command Time State Info -number root localhost test Query time NULL show full processlist prepare stmt4 from ' show grants for user '; prepare stmt4 from ' show create table t2 '; ERROR HY000: This command is not supported in the prepared statement protocol yet @@ -806,81 +802,3 @@ execute stmt1 ; prepare stmt1 from ' select * from t5 ' ; execute stmt1 ; drop table t5 ; -test_sequence ------- grant/revoke/drop affects a parallel session test ------ -show grants for second_user@localhost ; -ERROR 42000: There is no such grant defined for user 'second_user' on host 'localhost' -create database mysqltest; -use mysqltest; -use test; -grant usage on mysqltest.* to second_user@localhost -identified by 'looser' ; -grant select on mysqltest.t9 to second_user@localhost -identified by 'looser' ; -show grants for second_user@localhost ; -Grants for second_user@localhost -GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3' -GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost' -select current_user(); -current_user() -second_user@localhost -show grants for current_user(); -Grants for second_user@localhost -GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3' -GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost' -prepare s_t9 from 'select c1 as my_col - from t9 where c1= 1' ; -execute s_t9 ; -my_col -1 -select a as my_col from t1; -ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1' -grant select on mysqltest.t1 to second_user@localhost -identified by 'looser' ; -show grants for second_user@localhost ; -Grants for second_user@localhost -GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3' -GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost' -GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost' -drop table mysqltest.t9 ; -show grants for second_user@localhost ; -Grants for second_user@localhost -GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3' -GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost' -GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost' -show grants for second_user@localhost ; -Grants for second_user@localhost -GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3' -GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost' -GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost' -prepare s_t1 from 'select a as my_col from t1' ; -execute s_t1 ; -my_col -1 -2 -3 -4 -execute s_t9 ; -ERROR 42S02: Table 'mysqltest.t9' doesn't exist -revoke all privileges on mysqltest.t1 from second_user@localhost -identified by 'looser' ; -show grants for second_user@localhost ; -Grants for second_user@localhost -GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3' -GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost' -show grants for second_user@localhost ; -Grants for second_user@localhost -GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3' -GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost' -execute s_t1 ; -ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1' -revoke all privileges, grant option from second_user@localhost ; -show grants for second_user@localhost ; -Grants for second_user@localhost -GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3' -drop user second_user@localhost ; -commit ; -show grants for second_user@localhost ; -ERROR 42000: There is no such grant defined for user 'second_user' on host 'localhost' -drop table t1,t9 ; -drop database mysqltest; -- cgit v1.2.1