← 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: 2008-12-23 19:05:12 UTC
  • Revision ID: brian@tangent.org-20081223190512-qmt12mk2eb2xuzfm
Parser conflict removal (dead code in SET NAME).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
412
412
 
413
413
%pure_parser                                    /* We have threads */
414
414
/*
415
 
  Currently there are 93 shift/reduce conflicts.
 
415
  Currently there are 92 shift/reduce conflicts.
416
416
  We should not introduce new conflicts any more.
417
417
*/
418
 
%expect 93
 
418
%expect 92
419
419
 
420
420
/*
421
421
   Comments for TOKENS.
6463
6463
            LEX *lex=Lex;
6464
6464
            lex->var_list.push_back(new set_var($3, $4.var, &$4.base_name, $6));
6465
6465
          }
6466
 
        | NAMES_SYM COLLATE_SYM collation_name_or_default
6467
 
          {
6468
 
            LEX *lex= Lex;
6469
 
            $3= $3 ? $3 : global_system_variables.character_set_client;
6470
 
            lex->var_list.push_back(new set_var_collation_client($3,$3,$3));
6471
 
          }
6472
6466
        ;
6473
6467
 
6474
6468
internal_variable_name: