diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-08-25 13:17:45 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-08-25 13:17:45 +0400 |
| commit | 0d9b6fbd795339064cb30992b61948675e159d69 (patch) | |
| tree | 759dd358e345f228eea412014c456c88803dd402 /mysql-test | |
| parent | 29d01a11072ec8849f80b377895bee4767c4b0ca (diff) | |
| download | mariadb-git-0d9b6fbd795339064cb30992b61948675e159d69.tar.gz | |
Revert patch for Bug#56120 temporarily.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_group.result | 12 | ||||
| -rw-r--r-- | mysql-test/t/func_group.test | 11 |
2 files changed, 2 insertions, 21 deletions
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result index a9b3e98a26f..45c93971852 100644 --- a/mysql-test/r/func_group.result +++ b/mysql-test/r/func_group.result @@ -1715,7 +1715,7 @@ drop table t1; # End of 5.1 tests # -# Bug#55648: Server crash on MIN/MAX on maximum time value +# Bug#55648: Server crash on MIX/MAX on maximum time value # CREATE TABLE t1(c1 TIME NOT NULL); INSERT INTO t1 VALUES('837:59:59'); @@ -1725,13 +1725,3 @@ MAX(c1) 838:59:59 DROP TABLE t1; # End of the bug#55648 -# -# Bug#56120: Failed assertion on MIN/MAX on negative time value -# -CREATE TABLE t1(c1 TIME NOT NULL); -INSERT INTO t1 VALUES('-00:00:01'); -SELECT MAX(c1),MIN(c1) FROM t1; -MAX(c1) MIN(c1) --00:00:01 -00:00:01 -DROP TABLE t1; -# End of the bug#56120 diff --git a/mysql-test/t/func_group.test b/mysql-test/t/func_group.test index 04c52dd32bd..2914bb15d18 100644 --- a/mysql-test/t/func_group.test +++ b/mysql-test/t/func_group.test @@ -1086,7 +1086,7 @@ drop table t1; --echo End of 5.1 tests --echo # ---echo # Bug#55648: Server crash on MIN/MAX on maximum time value +--echo # Bug#55648: Server crash on MIX/MAX on maximum time value --echo # CREATE TABLE t1(c1 TIME NOT NULL); INSERT INTO t1 VALUES('837:59:59'); @@ -1095,12 +1095,3 @@ SELECT MAX(c1) FROM t1; DROP TABLE t1; --echo # End of the bug#55648 ---echo # ---echo # Bug#56120: Failed assertion on MIN/MAX on negative time value ---echo # -CREATE TABLE t1(c1 TIME NOT NULL); -INSERT INTO t1 VALUES('-00:00:01'); -SELECT MAX(c1),MIN(c1) FROM t1; -DROP TABLE t1; ---echo # End of the bug#56120 - |