← 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: 2009-03-26 08:22:57 UTC
  • mto: (968.2.25 mordred)
  • mto: This revision was merged to the branch mainline in revision 971.
  • Revision ID: mordred@inaugust.com-20090326082257-prliu70n35f2okqe
Moved flags into private area.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
4476
4476
  if (create_info->row_type == ROW_TYPE_NOT_USED)
4477
4477
    create_info->row_type= table->s->row_type;
4478
4478
 
4479
 
  if (ha_check_storage_engine_flag(old_db_type, HTON_BIT_ALTER_NOT_SUPPORTED) ||
4480
 
      ha_check_storage_engine_flag(new_db_type, HTON_BIT_ALTER_NOT_SUPPORTED))
 
4479
  if (old_db_type->check_flag(HTON_BIT_ALTER_NOT_SUPPORTED) ||
 
4480
      new_db_type->check_flag(HTON_BIT_ALTER_NOT_SUPPORTED))
4481
4481
  {
4482
4482
    my_error(ER_ILLEGAL_HA, MYF(0), table_name);
4483
4483
    goto err;
4934
4934
 
4935
4935
  write_bin_log(session, true, session->query, session->query_length);
4936
4936
 
4937
 
  if (ha_check_storage_engine_flag(old_db_type, HTON_BIT_FLUSH_AFTER_RENAME))
 
4937
  if (old_db_type->check_flag(HTON_BIT_FLUSH_AFTER_RENAME))
4938
4938
  {
4939
4939
    /*
4940
4940
      For the alter table to be properly flushed to the logs, we
5438
5438
                       table_name);
5439
5439
  }
5440
5440
  if (create_info->options & HA_LEX_CREATE_TMP_TABLE &&
5441
 
      ha_check_storage_engine_flag(*new_engine, HTON_BIT_TEMPORARY_NOT_SUPPORTED))
 
5441
      (*new_engine)->check_flag(HTON_BIT_TEMPORARY_NOT_SUPPORTED))
5442
5442
  {
5443
5443
    if (create_info->used_fields & HA_CREATE_USED_ENGINE)
5444
5444
    {