summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-06-13 22:18:40 -0700
committerIgor Babaev <igor@askmonty.org>2011-06-13 22:18:40 -0700
commit565b7feea86f1a192f809be41abd03c275ddb126 (patch)
treeec780685ccd7eb3408f0050a5b5da6c1c91d1b43 /sql/sql_derived.cc
parent56eb6d7e69ecce856e2d54e2404157407cb7203b (diff)
downloadmariadb-git-565b7feea86f1a192f809be41abd03c275ddb126.tar.gz
Fixed a typo in the patch for bug 794890.
Diffstat (limited to 'sql/sql_derived.cc')
-rw-r--r--sql/sql_derived.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 7474566b184..29cb3ede15d 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -512,7 +512,7 @@ bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived)
else
{
if (thd->lex->sql_command == SQLCOM_UPDATE_MULTI ||
- thd->lex->sql_command != SQLCOM_DELETE_MULTI)
+ thd->lex->sql_command == SQLCOM_DELETE_MULTI)
thd->save_prep_leaf_list= TRUE;
if (!derived->merged_for_insert && mysql_derived_merge(thd, lex, derived))
return TRUE;