← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/discover_xt.cc

  • Committer: Brian Aker
  • Date: 2011-02-18 16:48:57 UTC
  • mfrom: (2180.1.3 drizzle-staging)
  • Revision ID: brian@tangent.org-20110218164857-4n61en8wai9c91gi
Rollup all of Olaf's branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/discover_xt.cc
213
213
  int           timestamps= 0, timestamps_with_niladic= 0;
214
214
  int           field_no,dup_no;
215
215
  int           select_field_pos,auto_increment=0;
216
 
  List_iterator<Create_field> it(alter_info->create_list);
217
 
  List_iterator<Create_field> it2(alter_info->create_list);
 
216
  List<Create_field>::iterator it(alter_info->create_list);
 
217
  List<Create_field>::iterator it2(alter_info->create_list);
218
218
  uint total_uneven_bit_length= 0;
219
219
  DBUG_ENTER("mysql_prepare_create_table");
220
220
 
308
308
        */
309
309
        interval= sql_field->interval= typelib(thd->mem_root,
310
310
                                               sql_field->interval_list);
311
 
        List_iterator<String> int_it(sql_field->interval_list);
 
311
        List<String>::iterator int_it(sql_field->interval_list);
312
312
        String conv, *tmp;
313
313
        char comma_buf[2];
314
314
        int comma_length= cs->cset->wc_mb(cs, ',', (uchar*) comma_buf,
539
539
 
540
540
  /* Create keys */
541
541
 
542
 
  List_iterator<Key> key_iterator(alter_info->key_list);
543
 
  List_iterator<Key> key_iterator2(alter_info->key_list);
 
542
  List<Key>::iterator key_iterator(alter_info->key_list);
 
543
  List<Key>::iterator key_iterator2(alter_info->key_list);
544
544
  uint key_parts=0, fk_key_count=0;
545
545
  bool primary_key=0,unique_key=0;
546
546
  Key *key, *key2;
752
752
    if (key_info->block_size)
753
753
      key_info->flags|= HA_USES_BLOCK_SIZE;
754
754
 
755
 
    List_iterator<Key_part_spec> cols(key->columns), cols2(key->columns);
 
755
    List<Key_part_spec>::iterator cols(key->columns), cols2(key->columns);
756
756
    CHARSET_INFO *ft_key_charset=0;  // for FULLTEXT
757
757
    for (uint column_nr=0 ; (column=cols++) ; column_nr++)
758
758
    {