← Back to branch summary

~clint-fewbar/drizzle/authorize-default-deny

« back to all changes in this revision

Viewing changes to plugin/pbms/src/discover_ms.cc

  • Committer: Clint Byrum
  • Date: 2011-02-22 22:25:07 UTC
  • mfrom: (2177.1.15 build)
  • Revision ID: clint@ubuntu.com-20110222222507-azaofg4p8w55gdvr
merging trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/discover_ms.cc
212
212
  int           timestamps= 0, timestamps_with_niladic= 0;
213
213
  int           field_no,dup_no;
214
214
  int           select_field_pos,auto_increment=0;
215
 
  List_iterator<Create_field> it(alter_info->create_list);
216
 
  List_iterator<Create_field> it2(alter_info->create_list);
 
215
  List<Create_field>::iterator it(alter_info->create_list);
 
216
  List<Create_field>::iterator it2(alter_info->create_list);
217
217
  uint total_uneven_bit_length= 0;
218
218
  DBUG_ENTER("mysql_prepare_create_table");
219
219
 
307
307
        */
308
308
        interval= sql_field->interval= typelib(thd->mem_root,
309
309
                                               sql_field->interval_list);
310
 
        List_iterator<String> int_it(sql_field->interval_list);
 
310
        List<String>::iterator int_it(sql_field->interval_list);
311
311
        String conv, *tmp;
312
312
        char comma_buf[2];
313
313
        int comma_length= cs->cset->wc_mb(cs, ',', (uchar*) comma_buf,
487
487
        sql_field->sql_type == MYSQL_TYPE_VARCHAR &&
488
488
        create_info->row_type != ROW_TYPE_FIXED)
489
489
      (*db_options)|= HA_OPTION_PACK_RECORD;
490
 
    it2.rewind();
 
490
    it2= alter_info->create_list;
491
491
  }
492
492
 
493
493
  /* record_offset will be increased with 'length-of-null-bits' later */
494
494
  record_offset= 0;
495
495
  null_fields+= total_uneven_bit_length;
496
496
 
497
 
  it.rewind();
 
497
  it= alter_info->create_list;
498
498
  while ((sql_field=it++))
499
499
  {
500
500
    DBUG_ASSERT(sql_field->charset != 0);
538
538
 
539
539
  /* Create keys */
540
540
 
541
 
  List_iterator<Key> key_iterator(alter_info->key_list);
542
 
  List_iterator<Key> key_iterator2(alter_info->key_list);
 
541
  List<Key>::iterator key_iterator(alter_info->key_list);
 
542
  List<Key>::iterator key_iterator2(alter_info->key_list);
543
543
  uint key_parts=0, fk_key_count=0;
544
544
  bool primary_key=0,unique_key=0;
545
545
  Key *key, *key2;
584
584
      my_error(ER_TOO_LONG_IDENT, MYF(0), key->DOT_STR(name));
585
585
      DBUG_RETURN(TRUE);
586
586
    }
587
 
    key_iterator2.rewind ();
 
587
    key_iterator2= alter_info->key_list;
588
588
    if (key->type != Key::FOREIGN_KEY)
589
589
    {
590
590
      while ((key2 = key_iterator2++) != key)
637
637
  if (!*key_info_buffer || ! key_part_info)
638
638
    DBUG_RETURN(TRUE);                          // Out of memory
639
639
 
640
 
  key_iterator.rewind();
 
640
  key_iterator= alter_info->key_list;
641
641
  key_number=0;
642
642
  for (; (key=key_iterator++) ; key_number++)
643
643
  {
751
751
    if (key_info->block_size)
752
752
      key_info->flags|= HA_USES_BLOCK_SIZE;
753
753
 
754
 
    List_iterator<Key_part_spec> cols(key->columns), cols2(key->columns);
 
754
    List<Key_part_spec>::iterator cols(key->columns);
 
755
    List<Key_part_spec>::iterator cols2(key->columns);
755
756
    CHARSET_INFO *ft_key_charset=0;  // for FULLTEXT
756
757
    for (uint column_nr=0 ; (column=cols++) ; column_nr++)
757
758
    {
758
759
      uint length;
759
760
      Key_part_spec *dup_column;
760
761
 
761
 
      it.rewind();
 
762
      it= alter_info->create_list;
762
763
      field=0;
763
764
      while ((sql_field=it++) &&
764
765
             my_strcasecmp(system_charset_info,
781
782
          DBUG_RETURN(TRUE);
782
783
        }
783
784
      }
784
 
      cols2.rewind();
 
785
      cols2= key->columns;
785
786
      if (key->type == Key::FULLTEXT)
786
787
      {
787
788
        if ((sql_field->sql_type != MYSQL_TYPE_STRING &&
1024
1025
  create_info->null_bits= null_fields;
1025
1026
 
1026
1027
  /* Check fields. */
1027
 
  it.rewind();
 
1028
  it= alter_info->create_list;
1028
1029
  while ((sql_field=it++))
1029
1030
  {
1030
1031
    Field::utype type= (Field::utype) MTYP_TYPENR(sql_field->unireg_check);