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 | a265fde655316a4c1b1702bb97dd7fdde621f55c (patch) | |
| tree | 5e85d791f20560e94b9b79c740448bd988b04ede | |
| parent | 72ae1d65dd62f1e2cc308549a84a46feadd158f4 (diff) | |
| parent | 0a8419dfdd6d80b6029c354fb0a82683b2fef617 (diff) | |
| download | mariadb-git-a265fde655316a4c1b1702bb97dd7fdde621f55c.tar.gz | |
merge
| -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 5112aececa4..0d4ce9414e5 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1318,6 +1318,7 @@ SET TIMESTAMP=-1; SELECT UTC_TIMESTAMP(); SET TIMESTAMP=1; SELECT UTC_TIMESTAMP(); +SET TIMESTAMP=0; End of 5.0 tests select date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND); date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND) 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 |