diff options
| author | Sergey Petrunia <sergefp@mysql.com> | 2008-07-15 21:46:02 +0400 |
|---|---|---|
| committer | Sergey Petrunia <sergefp@mysql.com> | 2008-07-15 21:46:02 +0400 |
| commit | 7a92412c5959ce3c216485be1951dead7d778326 (patch) | |
| tree | 466955c9bb93adf167f39ad0a759ea8e1ac8144d /sql/sql_delete.cc | |
| parent | a3619d2e865eb5705a8acfc10db91ae700bb7043 (diff) | |
| parent | 62513bb1bca33902fa909ca13b25c550046ee3ae (diff) | |
| download | mariadb-git-7a92412c5959ce3c216485be1951dead7d778326.tar.gz | |
Merge fix for BUG#35478 into 5.1
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 38a71ab1e32..73a46aaac98 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -245,7 +245,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, DBUG_RETURN(TRUE); } if (usable_index==MAX_KEY) - init_read_record(&info,thd,table,select,1,1); + init_read_record(&info, thd, table, select, 1, 1, FALSE); else init_read_record_idx(&info, thd, table, 1, usable_index); @@ -834,7 +834,7 @@ int multi_delete::do_deletes() } READ_RECORD info; - init_read_record(&info,thd,table,NULL,0,1); + init_read_record(&info, thd, table, NULL, 0, 1, FALSE); /* Ignore any rows not found in reference tables as they may already have been deleted by foreign key handling |