diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 20:10:57 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 20:10:57 +0200 |
| commit | 6954b67255f52a081dead83df19ac04a60fa30a1 (patch) | |
| tree | af9daa1c97870662fc8888e46461d403d8141120 /mysql-test | |
| parent | 59f68983ffee45616a8ec255b5f13535236dd0ea (diff) | |
| download | mariadb-git-6954b67255f52a081dead83df19ac04a60fa30a1.tar.gz | |
Bug #52315 part 2 addendum : reset back the timestamp
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_time.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/func_time.test | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 8638fb09e5a..0bca06a55e2 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1340,4 +1340,5 @@ SET TIMESTAMP=-1; SELECT UTC_TIMESTAMP(); SET TIMESTAMP=1; SELECT UTC_TIMESTAMP(); +SET TIMESTAMP=0; End of 5.0 tests diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 475938b4458..7ec07dd786a 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -856,5 +856,8 @@ 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 |