← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Lee Bieber
  • Date: 2011-02-23 23:22:48 UTC
  • mfrom: (2183.2.20 list2)
  • mto: This revision was merged to the branch mainline in revision 2197.
  • Revision ID: kalebral@gmail.com-20110223232248-ev4y8pyt16b806o0
Merge Olaf - Use List::size()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
562
562
 
563
563
  plugin::StorageEngine *engine= plugin::StorageEngine::findByName(create_proto.engine().name());
564
564
 
565
 
  select_field_pos= alter_info->create_list.elements - select_field_count;
 
565
  select_field_pos= alter_info->create_list.size() - select_field_count;
566
566
  null_fields=blob_columns=0;
567
567
  max_key_length= engine->max_key_length();
568
568
 
859
859
                                       fk_key->update_opt,
860
860
                                       fk_key->match_opt);
861
861
 
862
 
      if (fk_key->ref_columns.elements &&
863
 
          fk_key->ref_columns.elements != fk_key->columns.elements)
 
862
      if (fk_key->ref_columns.size() &&
 
863
          fk_key->ref_columns.size() != fk_key->columns.size())
864
864
      {
865
865
        my_error(ER_WRONG_FK_DEF, MYF(0),
866
866
                 (fk_key->name.str ? fk_key->name.str :
872
872
    }
873
873
    (*key_count)++;
874
874
    tmp= engine->max_key_parts();
875
 
    if (key->columns.elements > tmp)
 
875
    if (key->columns.size() > tmp)
876
876
    {
877
877
      my_error(ER_TOO_MANY_KEY_PARTS,MYF(0),tmp);
878
878
      return(true);
896
896
          /* @todo issue warning message */
897
897
          /* mark that the generated key should be ignored */
898
898
          if (!key2->generated ||
899
 
              (key->generated && key->columns.elements <
900
 
               key2->columns.elements))
 
899
              (key->generated && key->columns.size() <
 
900
               key2->columns.size()))
901
901
            key->name.str= ignore_key;
902
902
          else
903
903
          {
904
904
            key2->name.str= ignore_key;
905
 
            key_parts-= key2->columns.elements;
 
905
            key_parts-= key2->columns.size();
906
906
            (*key_count)--;
907
907
          }
908
908
          break;
910
910
      }
911
911
    }
912
912
    if (key->name.str != ignore_key)
913
 
      key_parts+=key->columns.elements;
 
913
      key_parts+=key->columns.size();
914
914
    else
915
915
      (*key_count)--;
916
916
    if (key->name.str && !tmp_table && (key->type != Key::PRIMARY) &&
963
963
    if (key->generated)
964
964
      key_info->flags|= HA_GENERATED_KEY;
965
965
 
966
 
    key_info->key_parts=(uint8_t) key->columns.elements;
 
966
    key_info->key_parts=(uint8_t) key->columns.size();
967
967
    key_info->key_part=key_part_info;
968
968
    key_info->usable_key_parts= key_number;
969
969
    key_info->algorithm= key->key_create_info.algorithm;
1455
1455
  bool          error= true;
1456
1456
 
1457
1457
  /* Check for duplicate fields and check type of table to create */
1458
 
  if (not alter_info->create_list.elements)
 
1458
  if (not alter_info->create_list.size())
1459
1459
  {
1460
1460
    my_message(ER_TABLE_MUST_HAVE_COLUMNS, ER(ER_TABLE_MUST_HAVE_COLUMNS),
1461
1461
               MYF(0));
1833
1833
    */
1834
1834
    if (!table->table)
1835
1835
    {
1836
 
      if (!session->warn_list.elements)
 
1836
      if (!session->warn_list.size())
1837
1837
        push_warning(session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
1838
1838
                     ER_CHECK_NO_SUCH_TABLE, ER(ER_CHECK_NO_SUCH_TABLE));
1839
1839
      result_code= HA_ADMIN_CORRUPT;