← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_table.cc

  • Committer: Eric Day
  • Date: 2009-10-31 21:53:33 UTC
  • mfrom: (1200 staging)
  • mto: This revision was merged to the branch mainline in revision 1202.
  • Revision ID: eday@oddments.org-20091031215333-j94bjoanwmi68p6f
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/create_table.cc
24
24
#include <drizzled/session.h>
25
25
#include <drizzled/statement/create_table.h>
26
26
 
27
 
using namespace drizzled;
 
27
namespace drizzled
 
28
{
28
29
 
29
30
bool statement::CreateTable::execute()
30
31
{
41
42
  {
42
43
 
43
44
    create_info.db_type= 
44
 
      plugin::StorageEngine::findByName(session, create_table_proto.engine().name());
 
45
      plugin::StorageEngine::findByName(*session, create_table_proto.engine().name());
45
46
 
46
47
    if (create_info.db_type == NULL)
47
48
    {
53
54
  }
54
55
  else /* We now get the default, place it in create_info, and put the engine name in table proto */
55
56
  {
56
 
    create_info.db_type= ha_default_storage_engine(session);
 
57
    create_info.db_type= session->getDefaultStorageEngine();
57
58
  }
58
59
 
59
60
 
211
212
 
212
213
  return res;
213
214
}
 
215
 
 
216
} /* namespace drizzled */
 
217