Commit f2fd3c27 authored by unknown's avatar unknown
Browse files

After-merge fixes (Bug#13134)

parent e0b4e228

sql/field.cc

+3 −1
Original line number Diff line number Diff line
@@ -8269,7 +8269,7 @@ void create_field::init_for_tmp_table(enum_field_types sql_type_arg, 
{

  field_name= "";

  sql_type= sql_type_arg;

  length= length_arg;;

  char_length= length= length_arg;;

  unireg_check= Field::NONE;

  interval= 0;

  charset= &my_charset_bin;
@@ -8597,6 +8597,8 @@ bool create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, 
  case FIELD_TYPE_DECIMAL:

    DBUG_ASSERT(0); /* Was obsolete */

  }

  /* Remember the value of length */

  char_length= length;



  if (!(flags & BLOB_FLAG) &&

      ((length > max_field_charlength && fld_type != FIELD_TYPE_SET &&

sql/sql_parse.cc

+0 −1
Original line number Diff line number Diff line
@@ -5791,7 +5791,6 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type, 
                      interval_list, cs, uint_geom_type))

    DBUG_RETURN(1);



  new_field->char_length= new_field->length;

  lex->create_list.push_back(new_field);

  lex->last_field=new_field;

  DBUG_RETURN(0);