Manually merged

configure.in:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/r/replace.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

1 files changed, 12 insertions, 0 deletions

diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 513ef692ed7..e3f10c9716f 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -365,6 +365,7 @@ public:
   {
     return tmp_table_field_from_field_type(table, 0);
   }
+  bool result_as_longlong() { return TRUE; }
 };
 
 
@@ -380,6 +381,7 @@ public:
   {
     return tmp_table_field_from_field_type(table, 0);
   }
+  bool result_as_longlong() { return TRUE; }
 };
 
 
@@ -409,6 +411,7 @@ public:
     TIME representation using UTC-SYSTEM or per-thread time zone.
   */
   virtual void store_now_in_TIME(TIME *now_time)=0;
+  bool result_as_longlong() { return TRUE; }
 };
 
 
@@ -647,6 +650,7 @@ public:
   {
     return tmp_table_field_from_field_type(table, 0);
   }
+  bool result_as_longlong() { return TRUE; }
   bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
@@ -768,6 +772,8 @@ public:
     max_length= 10;
     maybe_null= 1;
   }
+  bool result_as_longlong() { return TRUE; }
+  longlong val_int();
 };
 
 
@@ -784,6 +790,8 @@ public:
   {
     return tmp_table_field_from_field_type(table, 0);
   }
+  bool result_as_longlong() { return TRUE; }
+  longlong val_int();
 };
 
 
@@ -799,6 +807,8 @@ public:
   {
     return tmp_table_field_from_field_type(table, 0);
   }
+  bool result_as_longlong() { return TRUE; }
+  longlong val_int();
 };
 
 class Item_func_makedate :public Item_str_func
@@ -817,6 +827,8 @@ public:
   {
     return tmp_table_field_from_field_type(table, 0);
   }
+  bool result_as_longlong() { return TRUE; }
+  longlong val_int();
   bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };