← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

Merged vcol stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
2878
2878
                       Item *default_value, Item *on_update_value,
2879
2879
                       LEX_STRING *comment,
2880
2880
                       char *change,
2881
 
                       List<String> *interval_list, const CHARSET_INFO * const cs)
 
2881
                       List<String> *interval_list, const CHARSET_INFO * const cs,
 
2882
                       virtual_column_info *vcol_info)
2882
2883
{
2883
2884
  register Create_field *new_field;
2884
2885
  LEX  *lex= thd->lex;
2949
2950
  if (!(new_field= new Create_field()) ||
2950
2951
      new_field->init(thd, field_name->str, type, length, decimals, type_modifier,
2951
2952
                      default_value, on_update_value, comment, change,
2952
 
                      interval_list, cs, 0, column_format))
 
2953
                      interval_list, cs, 0, column_format,
 
2954
                      vcol_info))
2953
2955
    return(1);
2954
2956
 
2955
2957
  lex->alter_info.create_list.push_back(new_field);