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 /sql/item_cmpfunc.cc | |
| 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
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 1 insertions, 2 deletions
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; |