A fix (bug #2335: Inconsistancy with handling of Years and NOW() function).

The test might fail if one runs it at 23:59:59 Dec 31


mysql-test/r/type_year.result:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
mysql-test/t/type_year.test:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
sql/field.h:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)

mysql-test/r/type_year.result

@@ -26,3 +26,9 @@ y	y2
 2001	01
 2069	69
 drop table t1;
+create table t1 (y year);
+insert into t1 values (now());
+select if(y = now(), 1, 0) from t1;
+if(y = now(), 1, 0)
+1
+drop table t1;

mysql-test/t/type_year.test

@@ -8,3 +8,12 @@ select * from t1;
 select * from t1 order by y;
 select * from t1 order by y2;
 drop table t1;
+
+#
+# Bug 2335
+#
+
+create table t1 (y year);
+insert into t1 values (now());
+select if(y = now(), 1, 0) from t1;
+drop table t1;

sql/field.h

@@ -600,6 +600,7 @@ public:
   longlong val_int(void);
   String *val_str(String*,String *);
   void sql_type(String &str) const;
+  bool store_for_compare() { return 1; }
 };