MDEV-8707 Wrong result for

SELECT..WHERE varchar_column=DATE'2001-01-01' AND varchar_column='2001-01-01'

1 files changed, 8 insertions, 1 deletions

diff --git a/sql/item.h b/sql/item.h
index 86dcd7abdbb..127f1cf138f 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -127,6 +127,13 @@ public:
     derivation= derivation_arg;
     set_repertoire_from_charset(collation_arg);
   }
+  DTCollation(CHARSET_INFO *collation_arg,
+              Derivation derivation_arg,
+              uint repertoire_arg)
+   :collation(collation_arg),
+    derivation(derivation_arg),
+    repertoire(repertoire_arg)
+  { }
   void set(const DTCollation &dt)
   { 
     collation= dt.collation;
@@ -160,7 +167,7 @@ public:
   }
   void set(Derivation derivation_arg)
   { derivation= derivation_arg; }
-  bool aggregate(DTCollation &dt, uint flags= 0);
+  bool aggregate(const DTCollation &dt, uint flags= 0);
   bool set(DTCollation &dt1, DTCollation &dt2, uint flags= 0)
   { set(dt1); return aggregate(dt2, flags); }
   const char *derivation_name() const