Commit 9abc2aad authored by Georgi Kodinov's avatar Georgi Kodinov

merge

parents fe145b09 a265fde6
...@@ -816,9 +816,11 @@ SET TIMESTAMP=2147483647; SELECT UTC_TIMESTAMP(); ...@@ -816,9 +816,11 @@ SET TIMESTAMP=2147483647; SELECT UTC_TIMESTAMP();
SET TIMESTAMP=0; SELECT UTC_TIMESTAMP(); SET TIMESTAMP=0; SELECT UTC_TIMESTAMP();
SET TIMESTAMP=-1; SELECT UTC_TIMESTAMP(); SET TIMESTAMP=-1; SELECT UTC_TIMESTAMP();
SET TIMESTAMP=1; SELECT UTC_TIMESTAMP(); SET TIMESTAMP=1; SELECT UTC_TIMESTAMP();
SET TIMESTAMP=0;
--enable_result_log --enable_result_log
#reset back the timestamp value
SET TIMESTAMP=0;
--echo End of 5.0 tests --echo End of 5.0 tests
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment