← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Stewart Smith
  • Date: 2008-11-19 20:56:34 UTC
  • mto: This revision was merged to the branch mainline in revision 593.
  • Revision ID: stewart@flamingspork.com-20081119205634-q5rtyek1k8keho4l
remove frm_version from TABLE_SHARE

This also means that I_S.TABLES Version column is now 0 instead of 10 by default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
3304
3304
  Create_field *new_field;
3305
3305
  KEY_PART_INFO *key_part;
3306
3306
  KEY_PART_INFO *end;
3307
 
  /*
3308
 
    Remember if the new definition has new VARCHAR column;
3309
 
    create_info->varchar will be reset in mysql_prepare_create_table.
3310
 
  */
3311
 
  bool varchar= create_info->varchar;
3312
3307
 
3313
3308
  {
3314
3309
    /*
3389
3384
      create_info->used_fields & HA_CREATE_USED_ROW_FORMAT ||
3390
3385
      (alter_info->flags & (ALTER_RECREATE | ALTER_FOREIGN_KEY)) ||
3391
3386
      order_num ||
3392
 
      !table->s->mysql_version ||
3393
 
      (table->s->frm_version < FRM_VER_TRUE_VARCHAR && varchar))
 
3387
      !table->s->mysql_version)
3394
3388
  {
3395
3389
    *table_changes= IS_EQUAL_NO;
3396
3390
    /*
3412
3406
    /* TODO check for ADD/DROP FOREIGN KEY */
3413
3407
    if (alter_info->flags & ALTER_FOREIGN_KEY)
3414
3408
      *alter_flags|=  HA_ALTER_FOREIGN_KEY;
3415
 
    if (!table->s->mysql_version ||
3416
 
        (table->s->frm_version < FRM_VER_TRUE_VARCHAR && varchar))
3417
 
      *alter_flags|=  HA_ALTER_COLUMN_TYPE;
3418
3409
  }
3419
3410
  /*
3420
3411
    Go through fields and check if the original ones are compatible