← 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: 2009-08-24 20:01:53 UTC
  • mfrom: (1119.2.11 merge)
  • Revision ID: brian@gaz-20090824200153-o7lawmu7lfkimc33
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1148
1148
            lex->create_info.default_table_charset= NULL;
1149
1149
            lex->name.str= 0;
1150
1150
 
1151
 
            drizzled::message::Table *proto=
1152
 
              lex->create_table_proto= new(std::nothrow) drizzled::message::Table();
 
1151
            message::Table *proto=
 
1152
              lex->create_table_proto= new(std::nothrow) message::Table();
1153
1153
 
1154
1154
            if (lex->create_table_proto == NULL)
1155
1155
              DRIZZLE_YYABORT;
1156
1156
            
1157
1157
            proto->set_name($5->table.str);
1158
1158
            if($2 & HA_LEX_CREATE_TMP_TABLE)
1159
 
              proto->set_type(drizzled::message::Table::TEMPORARY);
 
1159
              proto->set_type(message::Table::TEMPORARY);
1160
1160
            else
1161
 
              proto->set_type(drizzled::message::Table::STANDARD);
 
1161
              proto->set_type(message::Table::STANDARD);
1162
1162
 
1163
1163
            {
1164
 
              drizzled::message::Table::StorageEngine *protoengine;
 
1164
              message::Table::StorageEngine *protoengine;
1165
1165
              protoengine= proto->mutable_engine();
1166
1166
              StorageEngine *engine= ha_default_storage_engine(session);
1167
1167
 
1189
1189
            lex->col_list.empty();
1190
1190
            lex->change=NULL;
1191
1191
 
1192
 
            lex->create_table_proto= new drizzled::message::Table();
 
1192
            lex->create_table_proto= new message::Table();
1193
1193
          }
1194
1194
          '(' key_list ')' key_options
1195
1195
          {
1351
1351
            Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
1352
1352
 
1353
1353
            {
1354
 
              drizzled::message::Table::StorageEngine *protoengine;
 
1354
              message::Table::StorageEngine *protoengine;
1355
1355
              protoengine= Lex->create_table_proto->mutable_engine();
1356
1356
 
1357
1357
              protoengine->set_name($3->getName());
1364
1364
          }
1365
1365
        | COMMENT_SYM opt_equal TEXT_STRING_sys
1366
1366
          {
1367
 
            drizzled::message::Table::TableOptions *tableopts;
 
1367
            message::Table::TableOptions *tableopts;
1368
1368
            tableopts= Lex->create_table_proto->mutable_options();
1369
1369
 
1370
1370
            tableopts->set_comment($3.str);
2070
2070
            lex->alter_info.reset();
2071
2071
            lex->alter_info.build_method= $2;
2072
2072
 
2073
 
            lex->create_table_proto= new drizzled::message::Table();
 
2073
            lex->create_table_proto= new message::Table();
2074
2074
          }
2075
2075
          alter_commands
2076
2076
          {}
4320
4320
                                                        TL_OPTION_UPDATING))
4321
4321
              DRIZZLE_YYABORT;
4322
4322
 
4323
 
            lex->create_table_proto= new drizzled::message::Table();
 
4323
            lex->create_table_proto= new message::Table();
4324
4324
          }
4325
4325
        | DROP DATABASE if_exists ident
4326
4326
          {