diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2007-01-03 10:04:47 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2007-01-03 10:04:47 +0100 |
| commit | dfa3c87874313a6291b4accfdf0b394d5cc37f39 (patch) | |
| tree | 53c61ba24d6e72bf7faebb520da41f12f3764e5b /sql/ha_ndbcluster.cc | |
| parent | cc5abe68ebb398434db7896defacf858d2ccbe3c (diff) | |
| parent | 905b64160bcfc1e9f092699071481deaed6ef37f (diff) | |
| download | mariadb-git-dfa3c87874313a6291b4accfdf0b394d5cc37f39.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 0f580c833a9..107f21f28d2 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -2955,13 +2955,10 @@ KEY* key_info; DBUG_RETURN(error == HA_ERR_KEY_NOT_FOUND ? HA_ERR_END_OF_FILE : error); } else if (type == UNIQUE_INDEX) - { - error= unique_index_scan(key_info, - start_key->key, - start_key->length, - buf); - DBUG_RETURN(error == HA_ERR_KEY_NOT_FOUND ? HA_ERR_END_OF_FILE : error); - } + DBUG_RETURN(unique_index_scan(key_info, + start_key->key, + start_key->length, + buf)); break; default: break; |