← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Mark Atwood
  • Date: 2011-10-19 00:10:47 UTC
  • mfrom: (2440.2.13 rf)
  • Revision ID: me@mark.atwood.name-20111019001047-atj0u8gedphon1tb
merge lp:~olafvdspek/drizzle/refactor5

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1238
1238
                                  Lex.length, Lex.dec, Lex.type,
1239
1239
                                  statement->column_format,
1240
1240
                                  statement->default_value, statement->on_update_value,
1241
 
                                  &statement->comment,
 
1241
                                  statement->comment,
1242
1242
                                  statement->change, &Lex.interval_list, Lex.charset))
1243
1243
              DRIZZLE_YYABORT;
1244
1244
 
1943
1943
                                  statement->column_format,
1944
1944
                                  statement->default_value,
1945
1945
                                  statement->on_update_value,
1946
 
                                  &statement->comment,
 
1946
                                  statement->comment,
1947
1947
                                  $3.data(), &Lex.interval_list, Lex.charset))
1948
1948
              DRIZZLE_YYABORT;
1949
1949
          }
3241
3241
        | '@' opt_var_ident_type user_variable_ident opt_component
3242
3242
          {
3243
3243
            /* disallow "SELECT @@global.global.variable" */
3244
 
            if ($3.data() && $4.data() && parser::check_reserved_words(&$3))
 
3244
            if ($3.data() && $4.data() && parser::check_reserved_words($3))
3245
3245
            {
3246
3246
              parser::my_parse_error(YYSession->m_lip);
3247
3247
              DRIZZLE_YYABORT;