diff options
| author | Alexey Botchkov <holyfoot@mysql.com> | 2010-03-24 16:14:47 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@mysql.com> | 2010-03-24 16:14:47 +0400 |
| commit | f3b8b07a432e2aa449a5b8dc306f8de6bc62fcef (patch) | |
| tree | b221d6ddffa85a6f3b1dd274676b5343ae917b0f /sql | |
| parent | 9a9501c2aafd6766883ad75936f81a1f2604267e (diff) | |
| parent | 61b9ce16fd9dcf180fa8109682b75b1494bf09ee (diff) | |
| download | mariadb-git-f3b8b07a432e2aa449a5b8dc306f8de6bc62fcef.tar.gz | |
merging.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 168b16c61bf..5228a37f490 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3241,7 +3241,7 @@ end_with_restore_list: TODO: this is workaround. right way will be move invalidating in the unlock procedure. */ - if (first_table->lock_type == TL_WRITE_CONCURRENT_INSERT && + if (!res && first_table->lock_type == TL_WRITE_CONCURRENT_INSERT && thd->lock) { /* INSERT ... SELECT should invalidate only the very first table */ |