diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:19:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:19:05 +0200 |
| commit | 309c08c17c56d35e5635a5874fb70719935e5f54 (patch) | |
| tree | db63b0f496364456789f390eb5f693dabf0f94a1 /sql/sql_insert.cc | |
| parent | c6fdb92ca829fed893d9e7324e80b1450de16087 (diff) | |
| parent | 5ad02062d928cccbd29c0a2db6f0f7ceb33195d1 (diff) | |
| download | mariadb-git-309c08c17c56d35e5635a5874fb70719935e5f54.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index d89f5cc44ea..ef4b4703455 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3281,6 +3281,7 @@ bool Delayed_insert::handle_inserts(void) max_rows= 0; // For DBUG output #endif /* Remove all not used rows */ + mysql_mutex_lock(&mutex); while ((row=rows.get())) { if (table->s->blob_fields) @@ -3297,7 +3298,6 @@ bool Delayed_insert::handle_inserts(void) } DBUG_PRINT("error", ("dropped %lu rows after an error", max_rows)); thread_safe_increment(delayed_insert_errors, &LOCK_delayed_status); - mysql_mutex_lock(&mutex); DBUG_RETURN(1); } #endif /* EMBEDDED_LIBRARY */ |