← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

  • Committer: Brian Aker
  • Date: 2010-12-20 19:20:57 UTC
  • mto: This revision was merged to the branch mainline in revision 2016.
  • Revision ID: brian@tangent.org-20101220192057-1ch4b9uo008d8rje
Merge in additional fixes for sign, plus alter table, plus TIME on
processlist.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
337
337
      new_create_list.push_back(def);
338
338
      alter_it.rewind(); /* Change default if ALTER */
339
339
      AlterColumn *alter;
 
340
 
340
341
      while ((alter= alter_it++))
341
342
      {
342
343
        if (! my_strcasecmp(system_charset_info,field->field_name, alter->name))
343
344
          break;
344
345
      }
 
346
 
345
347
      if (alter)
346
348
      {
347
349
        if (def->sql_type == DRIZZLE_TYPE_BLOB)
349
351
          my_error(ER_BLOB_CANT_HAVE_DEFAULT, MYF(0), def->change);
350
352
          return true;
351
353
        }
 
354
 
352
355
        if ((def->def= alter->def))
353
356
        {
354
357
          /* Use new default */
620
623
             alter_info->drop_list.head()->name);
621
624
    return true;
622
625
  }
 
626
 
623
627
  if (alter_info->alter_list.elements)
624
628
  {
625
629
    my_error(ER_CANT_DROP_FIELD_OR_KEY,