diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2011-02-17 13:57:42 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2011-02-17 13:57:42 +0100 |
| commit | a39f26ce2dd33501c6f658927b10073683980b6c (patch) | |
| tree | a4940d23c61431cf27c212ef53baa1d539c39533 | |
| parent | 8176dec7538c2a61331f6e587b894cba6eb2bc2f (diff) | |
| download | mariadb-git-a39f26ce2dd33501c6f658927b10073683980b6c.tar.gz | |
Revert 59685, as we now cache datetimes correctly.
See also bug 11775312, all queries listed there now have the
same results here, as they have in 5.1
| -rw-r--r-- | mysql-test/r/type_date.result | 4 | ||||
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mysql-test/r/type_date.result b/mysql-test/r/type_date.result index 17e617758b4..96bd025aaed 100644 --- a/mysql-test/r/type_date.result +++ b/mysql-test/r/type_date.result @@ -303,10 +303,10 @@ CREATE TABLE t1(a DATE, b YEAR, KEY(a)); INSERT INTO t1 VALUES ('2011-01-01',2011); SELECT b = (SELECT CONVERT(a, DATE) FROM t1 GROUP BY a) FROM t1; b = (SELECT CONVERT(a, DATE) FROM t1 GROUP BY a) -0 +1 SELECT b = CONVERT((SELECT CONVERT(a, DATE) FROM t1 GROUP BY a), DATE) FROM t1; b = CONVERT((SELECT CONVERT(a, DATE) FROM t1 GROUP BY a), DATE) -0 +1 DROP TABLE t1; End of 5.1 tests # diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 9586004c630..67635c73b43 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -403,8 +403,7 @@ static bool convert_constant_item(THD *thd, Item_field *field_item, Field *field= field_item->field; int result= 0; - // TODO: revert Bug#59685 here, as we now cache datetimes correctly. - if (!(*item)->with_subselect && (*item)->const_item()) + if ((*item)->const_item()) { TABLE *table= field->table; ulonglong orig_sql_mode= thd->variables.sql_mode; |