summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2005-11-01 20:53:27 +0300
committerunknown <evgen@moonbone.local>2005-11-01 20:53:27 +0300
commit7d8e8032915d6ae33eff3368f0a0c1e87870c993 (patch)
tree74d90bd7afbc568475a43e4677d098b4f23203c8 /sql/sql_update.cc
parent70536ba1b5b4c8e81f71b714112b42ff3fcc3f5e (diff)
downloadmariadb-git-7d8e8032915d6ae33eff3368f0a0c1e87870c993.tar.gz
sql_update.cc:
After merge fix sql/sql_update.cc: After merge fix
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r--sql/sql_update.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 10debc9427d..bd19d4d85f3 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -237,9 +237,8 @@ int mysql_update(THD *thd,
}
// Don't count on usage of 'only index' when calculating which key to use
table->used_keys.clear_all();
- select= make_select(table, 0, 0, conds, 0, &error);
if (limit)
- select=make_select(table,0,0,conds,&error);
+ select= make_select(table, 0, 0, conds, 0, &error);
if (error || !limit ||
(select && select->check_quick(thd, safe_update, limit)))
{