diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-02-16 12:43:08 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-02-16 12:43:08 +0100 |
| commit | 93c8c8489acd63bc4c6afd0cdfb7817a32772e90 (patch) | |
| tree | e8081121fc36a6cbf52f2e4d8d31bf22a891684e /sql/sql_update.cc | |
| parent | caadae10e1f357be5dd804ee132d330c84a1da7b (diff) | |
| parent | ec075331b0b8f9ce710bb2bffe7fd1ca1db8f90f (diff) | |
| download | mariadb-git-93c8c8489acd63bc4c6afd0cdfb7817a32772e90.tar.gz | |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
ndb/test/run-test/Makefile.am:
Auto merged
sql/item.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index f9df1be2abd..17179bf9c5f 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -264,10 +264,8 @@ int mysql_update(THD *thd, else if ((used_index=table->file->key_used_on_scan) < MAX_KEY) used_key_is_modified=check_if_key_used(table, used_index, fields); else - { used_key_is_modified=0; - used_index= MAX_KEY; - } + if (used_key_is_modified || order) { /* |