← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to drizzled/statement/create_table.cc

  • Committer: Padraig O'Sullivan
  • Date: 2010-03-15 14:05:26 UTC
  • mfrom: (1237.9.99 staging)
  • Revision ID: osullivan.padraig@gmail.com-20100315140526-opbgwdwn6tfecdkq
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/create_table.cc
73
73
 
74
74
 
75
75
  /* If CREATE TABLE of non-temporary table, do implicit commit */
76
 
  if (! lex_identified_temp_table)
 
76
  if (not lex_identified_temp_table)
77
77
  {
78
 
    if (! session->endActiveTransaction())
 
78
    if (not session->endActiveTransaction())
79
79
    {
80
80
      return true;
81
81
    }
91
91
  */
92
92
  TableIdentifier new_table_identifier(create_table->db,
93
93
                                       create_table->table_name,
94
 
                                       create_table_proto.type() != message::Table::TEMPORARY ? NO_TMP_TABLE : TEMP_TABLE);
 
94
                                       create_table_proto.type() != message::Table::TEMPORARY ? STANDARD_TABLE : TEMP_TABLE);
95
95
 
96
96
  if (create_table_precheck(new_table_identifier))
97
97
  {
167
167
      if ((result= new select_create(create_table,
168
168
                                     is_if_not_exists,
169
169
                                     &create_info,
170
 
                                     &create_table_proto,
 
170
                                     create_table_proto,
171
171
                                     &alter_info,
172
172
                                     select_lex->item_list,
173
173
                                     session->lex->duplicates,
196
196
                                   create_table, 
197
197
                                   select_tables,
198
198
                                   create_table_proto,
199
 
                                   create_info.db_type, 
200
199
                                   is_if_not_exists,
201
200
                                   is_engine_set);
202
201
    }
213
212
      res= mysql_create_table(session, 
214
213
                              new_table_identifier,
215
214
                              &create_info,
216
 
                              &create_table_proto,
 
215
                              create_table_proto,
217
216
                              &alter_info, 
218
217
                              false, 
219
218
                              0,
220
219
                              is_if_not_exists);
221
220
    }
222
 
    if (! res)
 
221
    if (not res)
223
222
    {
224
223
      session->my_ok();
225
224
    }