diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-05-20 02:07:21 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-20 20:25:35 +0200 |
commit | ff1d10ef9c8595136cc7687aa59e638cf31db332 (patch) | |
tree | 1aeb1d16ce75cb40a56d34789f0b2c083e4aa8f6 /sql/sql_delete.cc | |
parent | 6f530c63cd90a86e3acb5e5e6bf81c6d666025eb (diff) | |
parent | 91dfb6141f45aed5cf3fe585d8c5db86f9ddbfe9 (diff) | |
download | mariadb-git-ff1d10ef9c8595136cc7687aa59e638cf31db332.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 48509a46ccb..93c7b0580bb 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -951,7 +951,7 @@ multi_delete::initialize_tables(JOIN *join) TABLE_LIST *tbl= walk->correspondent_table->find_table_for_update(); tables_to_delete_from|= tbl->table->map; if (delete_while_scanning && - unique_table(thd, tbl, join->tables_list, false)) + unique_table(thd, tbl, join->tables_list, 0)) { /* If the table we are going to delete from appears |