← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 20:45:43 UTC
  • mfrom: (2257 drizzle)
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329204543-ssex0nuo8knncgwx
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
145
145
}
146
146
 
147
147
static Item *default_value_item(enum_field_types field_type,
148
 
                                const CHARSET_INFO *charset,
 
148
                                const charset_info_st *charset,
149
149
                                bool default_null, const string *default_value,
150
150
                                const string *default_bin_value)
151
151
{
753
753
        else
754
754
          collation_id= table.options().collation_id();
755
755
 
756
 
        const CHARSET_INFO *cs= get_charset(collation_id);
 
756
        const charset_info_st *cs= get_charset(collation_id);
757
757
 
758
758
        mbmaxlen= cs->mbmaxlen;
759
759
      }
831
831
      {
832
832
        message::Table::Field::StringFieldOptions field_options= pfield.string_options();
833
833
 
834
 
        const CHARSET_INFO *cs= get_charset(field_options.has_collation_id() ?
 
834
        const charset_info_st *cs= get_charset(field_options.has_collation_id() ?
835
835
                                            field_options.collation_id() : 0);
836
836
 
837
837
        if (! cs)
923
923
    }
924
924
 
925
925
 
926
 
    const CHARSET_INFO *charset= get_charset(field_options.has_collation_id() ?
 
926
    const charset_info_st *charset= get_charset(field_options.has_collation_id() ?
927
927
                                             field_options.collation_id() : 0);
928
928
 
929
929
    if (! charset)
1024
1024
 
1025
1025
    field_type= proto_field_type_to_drizzle_type(pfield);
1026
1026
 
1027
 
    const CHARSET_INFO *charset= &my_charset_bin;
 
1027
    const charset_info_st *charset= &my_charset_bin;
1028
1028
 
1029
1029
    if (field_type == DRIZZLE_TYPE_BLOB ||
1030
1030
        field_type == DRIZZLE_TYPE_VARCHAR)
1880
1880
                              unsigned char null_bit,
1881
1881
                              uint8_t decimals,
1882
1882
                              enum_field_types field_type,
1883
 
                              const CHARSET_INFO * field_charset,
 
1883
                              const charset_info_st * field_charset,
1884
1884
                              Field::utype unireg_check,
1885
1885
                              TYPELIB *interval,
1886
1886
                              const char *field_name)
1908
1908
                              unsigned char null_bit,
1909
1909
                              uint8_t decimals,
1910
1910
                              enum_field_types field_type,
1911
 
                              const CHARSET_INFO * field_charset,
 
1911
                              const charset_info_st * field_charset,
1912
1912
                              Field::utype unireg_check,
1913
1913
                              TYPELIB *interval,
1914
1914
                              const char *field_name,