1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637


sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown 2006-11-29 18:54:01 +03:00
commit bc3fe09a77
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_yacc.yy
View File

@ -7054,6 +7054,8 @@ load_data_lock:
Ignore this option in SP to avoid problem with query cache Ignore this option in SP to avoid problem with query cache
*/ */
if (Lex->sphead != 0) if (Lex->sphead != 0)
$$= YYTHD->update_lock_default;
else
#endif #endif
$$= TL_WRITE_CONCURRENT_INSERT; $$= TL_WRITE_CONCURRENT_INSERT;
} }