← 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-15 21:05:47 UTC
  • mto: This revision was merged to the branch mainline in revision 1094.
  • Revision ID: brian@gaz-20090615210547-f4k9y7zuh5wxkuzq
Committing Stewart's tmp fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
3851
3851
    create_info->db_type= old_db_type;
3852
3852
  }
3853
3853
 
 
3854
  if(table->s->tmp_table != NO_TMP_TABLE)
 
3855
    create_info->options|= HA_LEX_CREATE_TMP_TABLE;
 
3856
 
3854
3857
  if (check_engine(session, new_name, create_info))
3855
3858
    goto err;
3856
3859
  new_db_type= create_info->db_type;
4675
4678
    }
4676
4679
    *new_engine= myisam_engine;
4677
4680
  }
 
4681
  if(!(create_info->options & HA_LEX_CREATE_TMP_TABLE)
 
4682
     && (*new_engine)->check_flag(HTON_BIT_TEMPORARY_ONLY))
 
4683
  {
 
4684
    my_error(ER_ILLEGAL_HA_CREATE_OPTION, MYF(0),
 
4685
             ha_resolve_storage_engine_name(*new_engine).c_str(),
 
4686
             "non-TEMPORARY");
 
4687
    *new_engine= 0;
 
4688
    return true;
 
4689
  }
 
4690
 
4678
4691
  return false;
4679
4692
}