← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1270
1270
            if (lex->sql_command == SQLCOM_INSERT)
1271
1271
            {
1272
1272
              lex->sql_command= SQLCOM_INSERT_SELECT;
1273
 
              delete lex->statement;
 
1273
              delete lex->statement;
1274
1274
              lex->statement= 
1275
1275
                new(std::nothrow) statement::InsertSelect(YYSession);
1276
1276
              if (lex->statement == NULL)
1279
1279
            else if (lex->sql_command == SQLCOM_REPLACE)
1280
1280
            {
1281
1281
              lex->sql_command= SQLCOM_REPLACE_SELECT;
1282
 
              delete lex->statement;
 
1282
              delete lex->statement;
1283
1283
              lex->statement= 
1284
1284
                new(std::nothrow) statement::ReplaceSelect(YYSession);
1285
1285
              if (lex->statement == NULL)