← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: lbieber at stabletransit
  • Date: 2010-10-18 20:26:50 UTC
  • mfrom: (1859.1.4 build)
  • Revision ID: lbieber@drizzle-build-n02.wc1.dfw1.stabletransit.com-20101018202650-hcvsp7yuaf1xy04s
Merge Monty - Adds support for a const std::string sys_var type.
Merge Monty - Make it possible to use sys_var directly from plugins.
Merge Padraig - Replaced a few unit8_t types that were being used as bitmaps with std::bitset

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
3723
3723
/* Warning - may return NULL in case of incomplete SELECT */
3724
3724
table_factor:
3725
3725
          {
3726
 
            Select_Lex *sel= Lex->current_select;
3727
 
            sel->table_join_options= 0;
3728
3726
          }
3729
3727
          table_ident opt_table_alias opt_key_definition
3730
3728
          {
3731
3729
            if (!($$= Lex->current_select->add_table_to_list(YYSession, $2, $3,
3732
 
                             Lex->current_select->get_table_join_options(),
 
3730
                             0,
3733
3731
                             Lex->lock_option,
3734
3732
                             Lex->current_select->pop_index_hints())))
3735
3733
              DRIZZLE_YYABORT;