← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Monty Taylor
  • Date: 2011-02-15 20:03:56 UTC
  • mto: (2184.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2185.
  • Revision ID: mordred@inaugust.com-20110215200356-83bpj32ketgrnd9f
A slew of tiny meaningless changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
782
782
      (*db_options)|= HA_OPTION_PACK_RECORD;
783
783
    }
784
784
 
785
 
    it2= alter_info->create_list.begin();
 
785
    it2= alter_info->create_list;
786
786
  }
787
787
 
788
788
  /* record_offset will be increased with 'length-of-null-bits' later */
789
789
  record_offset= 0;
790
790
  null_fields+= total_uneven_bit_length;
791
791
 
792
 
  it= alter_info->create_list.begin();
 
792
  it= alter_info->create_list;
793
793
  while ((sql_field=it++))
794
794
  {
795
795
    assert(sql_field->charset != 0);
880
880
    }
881
881
    if (check_identifier_name(&key->name, ER_TOO_LONG_IDENT))
882
882
      return(true);
883
 
    key_iterator2= alter_info->key_list.begin();
 
883
    key_iterator2= alter_info->key_list;
884
884
    if (key->type != Key::FOREIGN_KEY)
885
885
    {
886
886
      while ((key2 = key_iterator2++) != key)
933
933
  if (!*key_info_buffer || ! key_part_info)
934
934
    return(true);                               // Out of memory
935
935
 
936
 
  key_iterator= alter_info->key_list.begin();
 
936
  key_iterator= alter_info->key_list;
937
937
  key_number=0;
938
938
  for (; (key=key_iterator++) ; key_number++)
939
939
  {
1000
1000
      Key_part_spec *dup_column;
1001
1001
      int proto_field_nr= 0;
1002
1002
 
1003
 
      it= alter_info->create_list.begin();
 
1003
      it= alter_info->create_list;
1004
1004
      field=0;
1005
1005
      while ((sql_field=it++) && ++proto_field_nr &&
1006
1006
             my_strcasecmp(system_charset_info,
1027
1027
          return(true);
1028
1028
        }
1029
1029
      }
1030
 
      cols2= key->columns.begin();
 
1030
      cols2= key->columns;
1031
1031
 
1032
1032
      if (create_proto.field_size() > 0)
1033
1033
        protofield= create_proto.mutable_field(proto_field_nr - 1);
1240
1240
                     (qsort_cmp) sort_keys);
1241
1241
 
1242
1242
  /* Check fields. */
1243
 
  it= alter_info->create_list.begin();
 
1243
  it= alter_info->create_list;
1244
1244
  while ((sql_field=it++))
1245
1245
  {
1246
1246
    Field::utype type= (Field::utype) MTYP_TYPENR(sql_field->unireg_check);
1881
1881
    lex->cleanup_after_one_table_open();
1882
1882
    session->clear_error();  // these errors shouldn't get client
1883
1883
    {
1884
 
      List<DRIZZLE_ERROR>::iterator it(session->warn_list);
 
1884
      List_iterator_fast<DRIZZLE_ERROR> it(session->warn_list);
1885
1885
      DRIZZLE_ERROR *err;
1886
1886
      while ((err= it++))
1887
1887
      {