← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Lee Bieber
  • Date: 2011-03-01 22:41:46 UTC
  • mfrom: (2212.1.2 build)
  • Revision ID: kalebral@gmail.com-20110301224146-a4ulmgytz1lzb7ia
Merge Olaf - Use std::list
Merge Andrew - 724451: drizzle_escape_string doesn't handle blob data correctly

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1896
1896
          {
1897
1897
            statement::AlterTable *statement= (statement::AlterTable *)Lex->statement;
1898
1898
 
1899
 
            statement->alter_info.drop_list.push_back(new AlterDrop(AlterDrop::COLUMN, $3.str));
 
1899
            statement->alter_info.drop_list.push_back(AlterDrop(AlterDrop::COLUMN, $3.str));
1900
1900
            statement->alter_info.flags.set(ALTER_DROP_COLUMN);
1901
1901
          }
1902
1902
        | DROP FOREIGN KEY_SYM opt_ident
1929
1929
          {
1930
1930
            statement::AlterTable *statement= (statement::AlterTable *)Lex->statement;
1931
1931
 
1932
 
            statement->alter_info.alter_list.push_back(new AlterColumn($3.str,$6));
 
1932
            statement->alter_info.alter_list.push_back(AlterColumn($3.str,$6));
1933
1933
            statement->alter_info.flags.set(ALTER_COLUMN_DEFAULT);
1934
1934
          }
1935
1935
        | ALTER_SYM opt_column field_ident DROP DEFAULT
1936
1936
          {
1937
1937
            statement::AlterTable *statement= (statement::AlterTable *)Lex->statement;
1938
1938
 
1939
 
            statement->alter_info.alter_list.push_back(new AlterColumn($3.str, (Item*) 0));
 
1939
            statement->alter_info.alter_list.push_back(AlterColumn($3.str, (Item*) 0));
1940
1940
            statement->alter_info.flags.set(ALTER_COLUMN_DEFAULT);
1941
1941
          }
1942
1942
        | RENAME opt_to table_ident
4150
4150
            Lex->statement= statement;
4151
4151
            statement->alter_info.flags.set(ALTER_DROP_INDEX);
4152
4152
            statement->alter_info.build_method= $2;
4153
 
            statement->alter_info.drop_list.push_back(new AlterDrop(AlterDrop::KEY, $4.str));
 
4153
            statement->alter_info.drop_list.push_back(AlterDrop(AlterDrop::KEY, $4.str));
4154
4154
            if (not Lex->current_select->add_table_to_list(Lex->session, $6, NULL,
4155
4155
                                                          TL_OPTION_UPDATING))
4156
4156
              DRIZZLE_YYABORT;