← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2009-06-25 06:48:11 UTC
  • mfrom: (1063.6.5 csv-is-tmp)
  • Revision ID: brian@gaz-20090625064811-d4skabru3w2ewvco
Merge Stewart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
3659
3659
    create_info->db_type= old_db_type;
3660
3660
  }
3661
3661
 
 
3662
  if(table->s->tmp_table != NO_TMP_TABLE)
 
3663
    create_info->options|= HA_LEX_CREATE_TMP_TABLE;
 
3664
 
3662
3665
  if (check_engine(session, new_name, create_info))
3663
3666
    goto err;
3664
3667
  new_db_type= create_info->db_type;
4483
4486
    }
4484
4487
    *new_engine= myisam_engine;
4485
4488
  }
 
4489
  if(!(create_info->options & HA_LEX_CREATE_TMP_TABLE)
 
4490
     && (*new_engine)->check_flag(HTON_BIT_TEMPORARY_ONLY))
 
4491
  {
 
4492
    my_error(ER_ILLEGAL_HA_CREATE_OPTION, MYF(0),
 
4493
             ha_resolve_storage_engine_name(*new_engine).c_str(),
 
4494
             "non-TEMPORARY");
 
4495
    *new_engine= 0;
 
4496
    return true;
 
4497
  }
 
4498
 
4486
4499
  return false;
4487
4500
}