diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-05-19 16:30:36 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-19 22:05:55 +0200 |
commit | 91dfb6141f45aed5cf3fe585d8c5db86f9ddbfe9 (patch) | |
tree | 2a21bd15ac2547c12f0f60a8a5f680f0c996cd9b /sql/sql_delete.cc | |
parent | f76a17e355f4ee031f3cabbbd679643d85347834 (diff) | |
parent | c1b5d2801e81443c8ad02823e12d54f662e4c801 (diff) | |
download | mariadb-git-91dfb6141f45aed5cf3fe585d8c5db86f9ddbfe9.tar.gz |
Merge branch '10.0' into 10.1
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 bc067b667a6..453d7ffdc01 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -945,7 +945,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 |