← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 06:12:02 UTC
  • mfrom: (2190.1.6 drizzle-build)
  • Revision ID: brian@tangent.org-20110222061202-k03czxykqy4x9hjs
List update, header fixes, multiple symbols, and David deletes some code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
557
557
  int           timestamps= 0, timestamps_with_niladic= 0;
558
558
  int           dup_no;
559
559
  int           select_field_pos,auto_increment=0;
560
 
  List<CreateField>::iterator it(alter_info->create_list);
561
 
  List<CreateField>::iterator it2(alter_info->create_list);
 
560
  List<CreateField>::iterator it(alter_info->create_list.begin());
 
561
  List<CreateField>::iterator it2(alter_info->create_list.begin());
562
562
  uint32_t total_uneven_bit_length= 0;
563
563
 
564
564
  plugin::StorageEngine *engine= plugin::StorageEngine::findByName(create_proto.engine().name());
652
652
        interval= sql_field->interval= typelib(session->mem_root,
653
653
                                               sql_field->interval_list);
654
654
 
655
 
        List<String>::iterator int_it(sql_field->interval_list);
 
655
        List<String>::iterator int_it(sql_field->interval_list.begin());
656
656
        String conv, *tmp;
657
657
        char comma_buf[4];
658
658
        int comma_length= cs->cset->wc_mb(cs, ',', (unsigned char*) comma_buf,
829
829
 
830
830
  /* Create keys */
831
831
 
832
 
  List<Key>::iterator key_iterator(alter_info->key_list);
833
 
  List<Key>::iterator key_iterator2(alter_info->key_list);
 
832
  List<Key>::iterator key_iterator(alter_info->key_list.begin());
 
833
  List<Key>::iterator key_iterator2(alter_info->key_list.begin());
834
834
  uint32_t key_parts=0, fk_key_count=0;
835
835
  bool primary_key=0,unique_key=0;
836
836
  Key *key, *key2;
992
992
 
993
993
    message::Table::Field *protofield= NULL;
994
994
 
995
 
    List<Key_part_spec>::iterator cols(key->columns);
996
 
    List<Key_part_spec>::iterator cols2(key->columns);
 
995
    List<Key_part_spec>::iterator cols(key->columns.begin());
 
996
    List<Key_part_spec>::iterator cols2(key->columns.begin());
997
997
    for (uint32_t column_nr=0 ; (column=cols++) ; column_nr++)
998
998
    {
999
999
      uint32_t length;
1883
1883
    session->getLex()->cleanup_after_one_table_open();
1884
1884
    session->clear_error();  // these errors shouldn't get client
1885
1885
    {
1886
 
      List<DRIZZLE_ERROR>::iterator it(session->warn_list);
 
1886
      List<DRIZZLE_ERROR>::iterator it(session->warn_list.begin());
1887
1887
      DRIZZLE_ERROR *err;
1888
1888
      while ((err= it++))
1889
1889
      {