diff options
| author | unknown <sergefp@mysql.com> | 2005-10-28 22:31:41 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-10-28 22:31:41 +0400 |
| commit | ba0c548caa37129c935a23b26bcd1b86f35cf77a (patch) | |
| tree | 5b7ab910c0daf4f0a1fbb3d1a970892fa4153fe7 /sql/sql_update.cc | |
| parent | fbb2fd3e581170dca52c1f92a2474312423f66f4 (diff) | |
| parent | 562bfb2d57ab6f7a8d8c79b692ac1496372bcf7d (diff) | |
| download | mariadb-git-ba0c548caa37129c935a23b26bcd1b86f35cf77a.tar.gz | |
Merge
sql/sql_update.cc:
Auto merged
mysql-test/t/disabled.def:
SCCS merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 4de73f7b789..f83bd24f5d3 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -336,7 +336,7 @@ int mysql_update(THD *thd, /* If quick select is used, initialize it before retrieving rows. */ if (select && select->quick && select->quick->reset()) goto err; - if (used_index == MAX_KEY) + if (used_index == MAX_KEY || (select && select->quick)) init_read_record(&info,thd,table,select,0,1); else init_read_record_idx(&info, thd, table, 1, used_index); |