Commit b9567227 authored by unknown's avatar unknown
Browse files

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637 

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20637


sql/sql_yacc.yy:
  Auto merged
parents 0e978328 c707c7ea

sql/sql_yacc.yy

+2 −0
Original line number Diff line number Diff line
@@ -8697,6 +8697,8 @@ load_data_lock: 
              Ignore this option in SP to avoid problem with query cache

            */

            if (Lex->sphead != 0)

              $$= YYTHD->update_lock_default;

            else

#endif

              $$= TL_WRITE_CONCURRENT_INSERT;

          }