← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Stewart Smith
  • Date: 2009-06-17 08:30:25 UTC
  • mto: (1089.11.1 basic-discovery)
  • mto: This revision was merged to the branch mainline in revision 1072.
  • Revision ID: stewart@flamingspork.com-20090617083025-iwvtih4lpf16wpvq
Beginning of create table proto in parser: pass which Engine is being used for CREATE TABLE in table proto.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1134
1134
            else
1135
1135
              proto->set_type(drizzled::message::Table::STANDARD);
1136
1136
 
 
1137
            {
 
1138
              drizzled::message::Table::StorageEngine *protoengine;
 
1139
              protoengine= proto->mutable_engine();
 
1140
              StorageEngine *engine= ha_default_storage_engine(session);
 
1141
 
 
1142
              protoengine->set_name(engine->getName());
 
1143
            }
1137
1144
          }
1138
1145
          create2
1139
1146
          {
1311
1318
          {
1312
1319
            Lex->create_info.db_type= $3;
1313
1320
            Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
 
1321
 
 
1322
            {
 
1323
              drizzled::message::Table::StorageEngine *protoengine;
 
1324
              protoengine= Lex->create_table_proto->mutable_engine();
 
1325
 
 
1326
              protoengine->set_name($3->getName());
 
1327
            }
1314
1328
          }
1315
1329
        | MAX_ROWS opt_equal ulonglong_num
1316
1330
          {
2092
2106
            lex->create_info.row_type= ROW_TYPE_NOT_USED;
2093
2107
            lex->alter_info.reset();
2094
2108
            lex->alter_info.build_method= $2;
 
2109
 
 
2110
            lex->create_table_proto= new drizzled::message::Table();
2095
2111
          }
2096
2112
          alter_commands
2097
2113
          {}