← 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: 2011-01-11 21:28:17 UTC
  • mfrom: (2068.6.2 alter-table)
  • Revision ID: brian@gir-3-20110111212817-tbi3ij8zqn8r2k97
Merge in parser work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
280
280
  CreateField *def;
281
281
 
282
282
  /* First collect all fields from table which isn't in drop_list */
283
 
  Field **f_ptr;
284
283
  Field *field;
285
 
  for (f_ptr= table->getFields(); (field= *f_ptr); f_ptr++)
 
284
  for (Field **f_ptr= table->getFields(); (field= *f_ptr); f_ptr++)
286
285
  {
287
286
    /* Check if field should be dropped */
288
287
    AlterDrop *drop;
302
301
        break;
303
302
      }
304
303
    }
 
304
 
305
305
    if (drop)
306
306
    {
307
307
      drop_it.remove();
319
319
          ! my_strcasecmp(system_charset_info, field->field_name, def->change))
320
320
              break;
321
321
    }
 
322
 
322
323
    if (def)
323
324
    {
324
325
      /* Field is changed */
367
368
      }
368
369
    }
369
370
  }
 
371
 
370
372
  def_it.rewind();
371
373
  while ((def= def_it++)) /* Add new columns */
372
374
  {
423
425
      alter_info->build_method= HA_BUILD_OFFLINE;
424
426
    }
425
427
  }
 
428
 
426
429
  if (alter_info->alter_list.elements)
427
430
  {
428
431
    my_error(ER_BAD_FIELD_ERROR,
431
434
             table->getMutableShare()->getTableName());
432
435
    return true;
433
436
  }
 
437
 
434
438
  if (! new_create_list.elements)
435
439
  {
436
440
    my_message(ER_CANT_REMOVE_ALL_FIELDS,