diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 20:13:11 +0200 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 20:13:11 +0200 |
commit | 63a40fe65ccfe3c918c3c2dfa4bb0d2469f80864 (patch) | |
tree | 5e85d791f20560e94b9b79c740448bd988b04ede /mysql-test/t | |
parent | ac3243c8c82077c34e99e8f7f9a83e5bc9fd7b66 (diff) | |
parent | 6954b67255f52a081dead83df19ac04a60fa30a1 (diff) | |
download | mariadb-git-63a40fe65ccfe3c918c3c2dfa4bb0d2469f80864.tar.gz |
merge
Diffstat (limited to 'mysql-test/t')
-rw-r--r-- | mysql-test/t/func_time.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 032615ff56f..f32110ef87c 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -837,6 +837,9 @@ SET TIMESTAMP=-1; SELECT UTC_TIMESTAMP(); SET TIMESTAMP=1; SELECT UTC_TIMESTAMP(); --enable_result_log +#reset back the timestamp value +SET TIMESTAMP=0; + --echo End of 5.0 tests |