← 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-11-24 06:05:26 UTC
  • Revision ID: brian@tangent.org-20081124060526-z02hwac02i5membk
Remove lock condition needed (we do row based replication, so... lock is
uninteresting for us).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1382
1382
          SELECT_SYM
1383
1383
          {
1384
1384
            LEX *lex=Lex;
1385
 
            lex->lock_option= using_update_log ? TL_READ_NO_INSERT : TL_READ;
 
1385
            lex->lock_option= TL_READ;
1386
1386
            if (lex->sql_command == SQLCOM_INSERT)
1387
1387
              lex->sql_command= SQLCOM_INSERT_SELECT;
1388
1388
            else if (lex->sql_command == SQLCOM_REPLACE)
4852
4852
            lex->duplicates= DUP_ERROR; 
4853
4853
            mysql_init_select(lex);
4854
4854
            /* for subselects */
4855
 
            lex->lock_option= (using_update_log) ? TL_READ_NO_INSERT : TL_READ;
 
4855
            lex->lock_option= TL_READ;
4856
4856
          }
4857
4857
          insert_lock_option
4858
4858
          opt_ignore insert2