Commit 57221d3d authored by unknown's avatar unknown
Browse files

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
parent baf121de

mysql-test/mysql-test-run.sh

+2 −15
Original line number Diff line number Diff line
@@ -1507,20 +1507,7 @@ run_testcase () 
 if [ "x$USE_EMBEDDED_SERVER" = "x1" -a -z "$DO_TEST" ] ; then

   for t in \

       "init_connect" \

	"init_file" \

	"mix_innodb_myisam_binlog" \

	"mysqlbinlog2" \

	"mysqlbinlog" \

	"mysqldump" \

	"mysql_protocols" \

        "packet" \

	"ps_1general" \

	"rename" \

	"show_check" \

        "system_mysql_db_fix" \

        "timezone2" \

	"user_var" \

	"variables"

       "init_file"

   do

     if [ "$tname" = "$t" ] ; then

       skip_test $tname

mysql-test/r/ps_1general.result

+0 −82
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/ps_grant.result

0 → 100644
+82 −0
Original line number Diff line number Diff line 
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

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;

mysql-test/r/rpl_variables.result

0 → 100644
+8 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

set global slave_net_timeout=100;

set global sql_slave_skip_counter=100;

mysql-test/r/timezone2.result

+0 −52
Original line number Diff line number Diff line
@@ -251,58 +251,6 @@ select convert_tz(ts, @@time_zone, 'Japan') from t1; 
convert_tz(ts, @@time_zone, 'Japan')

2001-09-09 10:46:40

drop table t1;

delete from mysql.user where user like 'mysqltest\_%';

delete from mysql.db where user like 'mysqltest\_%';

delete from mysql.tables_priv where user like 'mysqltest\_%';

delete from mysql.columns_priv where user like 'mysqltest\_%';

flush privileges;

create table t1 (a int, b datetime);

create table t2 (c int, d datetime);

grant all privileges on test.* to mysqltest_1@localhost;

show grants for current_user();

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'

GRANT ALL PRIVILEGES ON `test`.* TO 'mysqltest_1'@'localhost'

set time_zone= '+00:00';

set time_zone= 'Europe/Moscow';

select convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC');

convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')

2004-10-21 15:00:00

select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;

convert_tz(b, 'Europe/Moscow', 'UTC')

update t1, t2 set t1.b = convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')

where t1.a = t2.c and t2.d = (select max(d) from t2);

select * from mysql.time_zone_name;

ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql'

select Name, convert_tz('2004-10-21 19:00:00', Name, 'UTC') from mysql.time_zone_name;

ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql'

delete from mysql.db where user like 'mysqltest\_%';

flush privileges;

grant all privileges on test.t1 to mysqltest_1@localhost;

grant all privileges on test.t2 to mysqltest_1@localhost;

show grants for current_user();

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'

GRANT ALL PRIVILEGES ON `test`.`t2` TO 'mysqltest_1'@'localhost'

GRANT ALL PRIVILEGES ON `test`.`t1` TO 'mysqltest_1'@'localhost'

set time_zone= '+00:00';

set time_zone= 'Europe/Moscow';

select convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC');

convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC')

2004-12-01 09:00:00

select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;

convert_tz(b, 'Europe/Moscow', 'UTC')

update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')

where t1.a = t2.c and t2.d = (select max(d) from t2);

select * from mysql.time_zone_name;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'

select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'

delete from mysql.user where user like 'mysqltest\_%';

delete from mysql.db where user like 'mysqltest\_%';

delete from mysql.tables_priv where user like 'mysqltest\_%';

flush privileges;

drop table t1, t2;

select convert_tz('2005-01-14 17:00:00', 'UTC', custTimeZone) from (select 'UTC' as custTimeZone) as tmp;

convert_tz('2005-01-14 17:00:00', 'UTC', custTimeZone)

2005-01-14 17:00:00