← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/discover_ms.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:
plugin/pbms/src/discover_ms.cc
224
224
 
225
225
  for (field_no=0; (sql_field=it++) ; field_no++)
226
226
  {
227
 
    CHARSET_INFO *save_cs;
 
227
    charset_info_st *save_cs;
228
228
 
229
229
    /*
230
230
      Initialize length from its original value (number of characters),
290
290
        sql_field->sql_type == MYSQL_TYPE_ENUM)
291
291
    {
292
292
      uint32 dummy;
293
 
      CHARSET_INFO *cs= sql_field->charset;
 
293
      charset_info_st *cs= sql_field->charset;
294
294
      TYPELIB *interval= sql_field->interval;
295
295
 
296
296
      /*
753
753
 
754
754
    List<Key_part_spec>::iterator cols(key->columns);
755
755
    List<Key_part_spec>::iterator cols2(key->columns);
756
 
    CHARSET_INFO *ft_key_charset=0;  // for FULLTEXT
 
756
    charset_info_st *ft_key_charset=0;  // for FULLTEXT
757
757
    for (uint column_nr=0 ; (column=cols++) ; column_nr++)
758
758
    {
759
759
      uint length;