← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2010-05-13 00:24:20 UTC
  • mto: This revision was merged to the branch mainline in revision 1533.
  • Revision ID: brian@gaz-20100513002420-rqxkrxegkwivaxmm
Merge engine options for schema/table.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1198
1198
          ident_or_text
1199
1199
        {
1200
1200
          statement::CreateSchema *statement= (statement::CreateSchema *)Lex->statement;
1201
 
          drizzled::message::Schema::Engine::Option *opt= statement->schema_message.mutable_engine()->add_options();
 
1201
          drizzled::message::Engine::Option *opt= statement->schema_message.mutable_engine()->add_options();
1202
1202
 
1203
1203
          opt->set_name($1.str);
1204
1204
        }
1205
1205
        | ident_or_text equal ident_or_text
1206
1206
        {
1207
1207
          statement::CreateSchema *statement= (statement::CreateSchema *)Lex->statement;
1208
 
          drizzled::message::Schema::Engine::Option *opt= statement->schema_message.mutable_engine()->add_options();
 
1208
          drizzled::message::Engine::Option *opt= statement->schema_message.mutable_engine()->add_options();
1209
1209
 
1210
1210
          opt->set_name($1.str);
1211
1211
          opt->set_state($3.str);
1217
1217
 
1218
1218
          snprintf(number_as_string, sizeof(number_as_string), "%"PRIu64, $3);
1219
1219
 
1220
 
          drizzled::message::Schema::Engine::Option *opt= statement->schema_message.mutable_engine()->add_options();
 
1220
          drizzled::message::Engine::Option *opt= statement->schema_message.mutable_engine()->add_options();
1221
1221
 
1222
1222
          opt->set_name($1.str);
1223
1223
          opt->set_state(number_as_string);
1256
1256
        ENGINE_SYM equal ident_or_text
1257
1257
          {
1258
1258
            statement::CreateTable *statement= (statement::CreateTable *)Lex->statement;
1259
 
            message::Table::StorageEngine *protoengine;
1260
 
            protoengine= ((statement::CreateTable *)Lex->statement)->create_table_message.mutable_engine();
1261
1259
 
1262
1260
            statement->is_engine_set= true;
1263
1261
 
1264
 
            protoengine->set_name($3.str);
 
1262
            ((statement::CreateTable *)Lex->statement)->create_table_message.mutable_engine()->set_name($3.str);
1265
1263
          }
1266
1264
        | COMMENT_SYM opt_equal TEXT_STRING_sys
1267
1265
          {
1283
1281
          }
1284
1282
        |  ident_or_text equal ident_or_text
1285
1283
          {
1286
 
            message::Table::StorageEngine *protoengine;
1287
 
            protoengine= ((statement::CreateTable *)Lex->statement)->create_table_message.mutable_engine();
1288
 
 
1289
 
            drizzled::message::Table::StorageEngine::EngineOption *opt= protoengine->add_options();
 
1284
            drizzled::message::Engine::Option *opt= ((statement::CreateTable *)Lex->statement)->create_table_message.mutable_engine()->add_options();
1290
1285
 
1291
1286
            opt->set_name($1.str);
1292
1287
            opt->set_state($3.str);
1296
1291
            char number_as_string[22];
1297
1292
            snprintf(number_as_string, sizeof(number_as_string), "%"PRIu64, $3);
1298
1293
 
1299
 
            message::Table::StorageEngine *protoengine;
1300
 
            protoengine= ((statement::CreateTable *)Lex->statement)->create_table_message.mutable_engine();
1301
 
 
1302
 
            drizzled::message::Table::StorageEngine::EngineOption *opt= protoengine->add_options();
 
1294
            drizzled::message::Engine::Option *opt= ((statement::CreateTable *)Lex->statement)->create_table_message.mutable_engine()->add_options();
1303
1295
            opt->set_name($1.str);
1304
1296
            opt->set_state(number_as_string);
1305
1297
          }