diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 20:16:06 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 20:16:06 +0200 |
| commit | 9abc2aadc55cc55f71bd6e348dc44e875c8cfbf8 (patch) | |
| tree | 2b68c44efa0755ab7f2b4d612564e43ec54d13f2 | |
| parent | fe145b0900d8006310232e2edb4137c04c116702 (diff) | |
| parent | a265fde655316a4c1b1702bb97dd7fdde621f55c (diff) | |
| download | mariadb-git-9abc2aadc55cc55f71bd6e348dc44e875c8cfbf8.tar.gz | |
merge
| -rw-r--r-- | mysql-test/t/func_time.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 153266055d7..eaa592c2ad5 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -816,9 +816,11 @@ SET TIMESTAMP=2147483647; SELECT UTC_TIMESTAMP(); SET TIMESTAMP=0; SELECT UTC_TIMESTAMP(); SET TIMESTAMP=-1; SELECT UTC_TIMESTAMP(); SET TIMESTAMP=1; SELECT UTC_TIMESTAMP(); -SET TIMESTAMP=0; --enable_result_log +#reset back the timestamp value +SET TIMESTAMP=0; + --echo End of 5.0 tests |