diff options
| author | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2010-03-25 13:26:48 +0100 |
|---|---|---|
| committer | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2010-03-25 13:26:48 +0100 |
| commit | 61b9ce16fd9dcf180fa8109682b75b1494bf09ee (patch) | |
| tree | 95859f02174fee49bc73ec902502aabc7d0b375f /sql | |
| parent | 5a9bad95a9c2db05f2e10b432ef52f5dc65e9b9b (diff) | |
| parent | ea7d830ad2c5715597d2d7e55215263f0fd8ba7c (diff) | |
| download | mariadb-git-61b9ce16fd9dcf180fa8109682b75b1494bf09ee.tar.gz | |
Automerge
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 */ |