Commit 7fe932ed authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  magare.gmz:/home/kgeorge/mysql/autopush/B33256-5.0-opt
parents 22d1a50d e4efb4a5

mysql-test/r/type_decimal.result

+0 −4
Original line number Diff line number Diff line
@@ -786,10 +786,6 @@ from (select 1 as s,'t' as t union select null, null ) as sub1; 
select group_concat(t) from t1 group by week(date)/10;

group_concat(t)

t

Warnings:

Warning	1292	Truncated incorrect datetime value: '0000-00-00'

Warning	1292	Truncated incorrect datetime value: '0000-00-00'

Warning	1292	Truncated incorrect datetime value: '0000-00-00'

drop table t1;

CREATE TABLE t1 (

qty decimal(16,6) default NULL,

sql/field.h

+4 −0
Original line number Diff line number Diff line
@@ -962,6 +962,10 @@ class Field_newdate :public Field_str { 
    :Field_str(ptr_arg, 10, null_ptr_arg, null_bit_arg,

	       unireg_check_arg, field_name_arg, table_arg, cs)

    {}

  Field_newdate(bool maybe_null_arg, const char *field_name_arg,

                struct st_table *table_arg, CHARSET_INFO *cs)

    :Field_str((char*) 0,10, maybe_null_arg ? (uchar*) "": 0,0,

               NONE, field_name_arg, table_arg, cs) {}

  enum_field_types type() const { return FIELD_TYPE_DATE;}

  enum_field_types real_type() const { return FIELD_TYPE_NEWDATE; }

  enum ha_base_keytype key_type() const { return HA_KEYTYPE_UINT24; }

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -4384,7 +4384,7 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table) 
			    name, table, 0, unsigned_flag);

  case MYSQL_TYPE_NEWDATE:

  case MYSQL_TYPE_DATE:

    return new Field_date(maybe_null, name, table, &my_charset_bin);

    return new Field_newdate(maybe_null, name, table, &my_charset_bin);

  case MYSQL_TYPE_TIME:

    return new Field_time(maybe_null, name, table, &my_charset_bin);

  case MYSQL_TYPE_TIMESTAMP:

sql/item_sum.cc

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ Field *Item_sum_hybrid::create_tmp_field(bool group, TABLE *table, 
  */

  switch (args[0]->field_type()) {

  case MYSQL_TYPE_DATE:

    return new Field_date(maybe_null, name, table, collation.collation);

    return new Field_newdate(maybe_null, name, table, collation.collation);

  case MYSQL_TYPE_TIME:

    return new Field_time(maybe_null, name, table, collation.collation);

  case MYSQL_TYPE_TIMESTAMP:

sql/item_timefunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -3303,7 +3303,7 @@ Field *Item_func_str_to_date::tmp_table_field(TABLE *t_arg) 
  if (cached_field_type == MYSQL_TYPE_TIME)

    return (new Field_time(maybe_null, name, t_arg, &my_charset_bin));

  if (cached_field_type == MYSQL_TYPE_DATE)

    return (new Field_date(maybe_null, name, t_arg, &my_charset_bin));

    return (new Field_newdate(maybe_null, name, t_arg, &my_charset_bin));

  if (cached_field_type == MYSQL_TYPE_DATETIME)

    return (new Field_datetime(maybe_null, name, t_arg, &my_charset_bin));

  return (new Field_string(max_length, maybe_null, name, t_arg, &my_charset_bin));