← Back to branch summary

~mysql/mysql-server/mysql-6.0

« back to all changes in this revision

Viewing changes to sql/item_timefunc.h

  • Committer: monty at mysql
  • Date: 2002-12-05 17:38:42 UTC
  • mfrom: (1346.7.103)
  • mto: (1388.1.1)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: sp1r-monty@mashka.mysql.fi-20021205173842-56440
Merge with 4.0.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/item_timefunc.h
325
325
    decimals=0;
326
326
    max_length=10*thd_charset()->mbmaxlen;
327
327
  }
328
 
  int  save_in_field(Field *to);
 
328
  int save_in_field(Field *to, bool no_conversions);
329
329
  void make_field(Send_field *tmp_field)
330
330
  {
331
331
    init_make_field(tmp_field,FIELD_TYPE_DATE);
406
406
  enum Item_result result_type () const { return STRING_RESULT; }
407
407
  double val()       { return (double) value; }
408
408
  longlong val_int() { return value; }
409
 
  int  save_in_field(Field *to);
 
409
  int save_in_field(Field *to, bool no_conversions);
410
410
  String *val_str(String *str);
411
411
  const char *func_name() const { return "now"; }
412
412
  void fix_length_and_dec();