← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

  • Committer: Lee Bieber
  • Date: 2011-02-24 03:20:47 UTC
  • mfrom: (2196.1.4 build)
  • Revision ID: kalebral@gmail.com-20110224032047-avmw06iwww3m73cw
Merge Andrew - 723653: Docs day first pass fixes 
Merge Brian - Puts back in support for COM_KILL, Also adds back in the INTERACTIVE flag, and creates a DD to track sessions/check on usage
Merge Olaf - Use List::size()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
165
165
                     createTableMessage(),
166
166
                     first_table,
167
167
                     &alter_info,
168
 
                     select_lex->order_list.elements,
 
168
                     select_lex->order_list.size(),
169
169
                     (Order *) select_lex->order_list.first,
170
170
                     getSession()->getLex()->ignore);
171
171
  }
188
188
                       createTableMessage(),
189
189
                       first_table,
190
190
                       &alter_info,
191
 
                       select_lex->order_list.elements,
 
191
                       select_lex->order_list.size(),
192
192
                       (Order *) select_lex->order_list.first,
193
193
                       getSession()->getLex()->ignore);
194
194
    }
437
437
    }
438
438
  }
439
439
 
440
 
  if (alter_info->alter_list.elements)
 
440
  if (alter_info->alter_list.size())
441
441
  {
442
442
    my_error(ER_BAD_FIELD_ERROR,
443
443
             MYF(0),
446
446
    return true;
447
447
  }
448
448
 
449
 
  if (not new_create_list.elements)
 
449
  if (not new_create_list.size())
450
450
  {
451
451
    my_message(ER_CANT_REMOVE_ALL_FIELDS,
452
452
               ER(ER_CANT_REMOVE_ALL_FIELDS),
528
528
                                            strlen(cfield->field_name),
529
529
                                            key_part_length));
530
530
    }
531
 
    if (key_parts.elements)
 
531
    if (key_parts.size())
532
532
    {
533
533
      key_create_information_st key_create_info= default_key_create_info;
534
534
      Key *key;
639
639
    }
640
640
  }
641
641
 
642
 
  if (alter_info->drop_list.elements)
 
642
  if (alter_info->drop_list.size())
643
643
  {
644
644
    my_error(ER_CANT_DROP_FIELD_OR_KEY,
645
645
             MYF(0),
647
647
    return true;
648
648
  }
649
649
 
650
 
  if (alter_info->alter_list.elements)
 
650
  if (alter_info->alter_list.size())
651
651
  {
652
652
    my_error(ER_CANT_DROP_FIELD_OR_KEY,
653
653
             MYF(0),