diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-11-29 18:54:01 +0300 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-11-29 18:54:01 +0300 |
| commit | bc3fe09a7774c7831837fc481b576d273e13da67 (patch) | |
| tree | a5042b095d9ea1cb1e223202780719ff67a0236c /sql/sql_yacc.yy | |
| parent | b4b2d3bcb4f3bd487da3c22fc201aca6bb3d475a (diff) | |
| parent | c707c7eae738627bb39c2b9c1f050e90971e8959 (diff) | |
| download | mariadb-git-bc3fe09a7774c7831837fc481b576d273e13da67.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 307999c1ada..2d315e91f52 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7054,6 +7054,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; } |