← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Monty Taylor
  • Date: 2008-11-30 23:45:15 UTC
  • mfrom: (631.1.2 drizzle)
  • mto: This revision was merged to the branch mainline in revision 634.
  • Revision ID: mordred@solanthus.local-20081130234515-67gyldntupydpain
Merged from ysano.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
4538
4538
  if (create_info->row_type == ROW_TYPE_NOT_USED)
4539
4539
    create_info->row_type= table->s->row_type;
4540
4540
 
4541
 
  if (ha_check_storage_engine_flag(old_db_type, HTON_ALTER_NOT_SUPPORTED) ||
4542
 
      ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED))
 
4541
  if (ha_check_storage_engine_flag(old_db_type, HTON_BIT_ALTER_NOT_SUPPORTED) ||
 
4542
      ha_check_storage_engine_flag(new_db_type, HTON_BIT_ALTER_NOT_SUPPORTED))
4543
4543
  {
4544
4544
    my_error(ER_ILLEGAL_HA, MYF(0), table_name);
4545
4545
    goto err;
4998
4998
                (create_info->options & HA_LEX_CREATE_TMP_TABLE)));
4999
4999
  write_bin_log(session, true, session->query, session->query_length);
5000
5000
 
5001
 
  if (ha_check_storage_engine_flag(old_db_type, HTON_FLUSH_AFTER_RENAME))
 
5001
  if (ha_check_storage_engine_flag(old_db_type, HTON_BIT_FLUSH_AFTER_RENAME))
5002
5002
  {
5003
5003
    /*
5004
5004
      For the alter table to be properly flushed to the logs, we
5485
5485
                       table_name);
5486
5486
  }
5487
5487
  if (create_info->options & HA_LEX_CREATE_TMP_TABLE &&
5488
 
      ha_check_storage_engine_flag(*new_engine, HTON_TEMPORARY_NOT_SUPPORTED))
 
5488
      ha_check_storage_engine_flag(*new_engine, HTON_BIT_TEMPORARY_NOT_SUPPORTED))
5489
5489
  {
5490
5490
    if (create_info->used_fields & HA_CREATE_USED_ENGINE)
5491
5491
    {