diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-08-25 12:40:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-08-25 12:40:09 +0200 |
| commit | 6b1863b8304662189a3b9a4aef1e1bebef035b86 (patch) | |
| tree | 48ba2cbdda863b644108e93ace3668333ae0d193 /sql/sql_insert.cc | |
| parent | ea91bb6801b1b619d64fa137ea351eca9de683ec (diff) | |
| parent | 5bbe929d706e26cb3f9b291da6009526a17b1545 (diff) | |
| download | mariadb-git-6b1863b8304662189a3b9a4aef1e1bebef035b86.tar.gz | |
Merge branch '10.0' into 10.1
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 b97bae6b23c..ac7fd93f0c0 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3338,6 +3338,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) @@ -3354,7 +3355,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 */ |