diff options
author | unknown <jimw@mysql.com> | 2005-03-29 17:17:46 -0800 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-03-29 17:17:46 -0800 |
commit | 57221d3d086bf8553d618ff7700bb3a7db0edb8f (patch) | |
tree | 5b4f57966d1a1dbc9789a2b148b4ad4a01328ceb /mysql-test/r/timezone2.result | |
parent | baf121de4f11c478c920c4bc21fef9d1be675a6e (diff) | |
download | mariadb-git-57221d3d086bf8553d618ff7700bb3a7db0edb8f.tar.gz |
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
Diffstat (limited to 'mysql-test/r/timezone2.result')
-rw-r--r-- | mysql-test/r/timezone2.result | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/mysql-test/r/timezone2.result b/mysql-test/r/timezone2.result index 206ff79e7ba..199b48ef1aa 100644 --- a/mysql-test/r/timezone2.result +++ b/mysql-test/r/timezone2.result @@ -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 |