summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2006-02-06 18:33:39 +0300
committerunknown <sergefp@mysql.com>2006-02-06 18:33:39 +0300
commit4f9e66daa409df056475d28fbed853feaacd2525 (patch)
tree4847689064a2f9b454f3066786b2e9de221e1752 /sql/sql_update.cc
parent6344fd64a515a773c9e68a5cac7c45299851c8e1 (diff)
downloadmariadb-git-4f9e66daa409df056475d28fbed853feaacd2525.tar.gz
WL#2985 "Partition pruning", "do pruning for UPDATE/DELETE": Post-merge fixes
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r--sql/sql_update.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index ab383241a28..d6bf01f5a25 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -168,7 +168,6 @@ int mysql_update(THD *thd,
thd->proc_info="init";
table= table_list->table;
- table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
/* Calculate "table->used_keys" based on the WHERE */
table->used_keys= table->s->keys_in_use;
@@ -252,12 +251,9 @@ int mysql_update(THD *thd,
send_ok(thd); // No matching records
DBUG_RETURN(0);
}
- /*
- Update the table->records number (note: we probably could remove the
- previous file->info() call)
- */
- table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
#endif
+ /* Update the table->file->records number */
+ table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
select= make_select(table, 0, 0, conds, 0, &error);
if (error || !limit ||