diff options
| author | unknown <mskold@mysql.com> | 2004-09-08 17:05:19 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2004-09-08 17:05:19 +0200 |
| commit | 4844315a9ec489bca451314d17501c8685794bf3 (patch) | |
| tree | 446bec9861daab27ba769bba01c3f49027a591aa /sql/handler.cc | |
| parent | 9b1a33435a4b12e6b30b7098efccfbfe319edb4f (diff) | |
| parent | 1187c2aefde245cb887637bb3acb2f556e5949f1 (diff) | |
| download | mariadb-git-4844315a9ec489bca451314d17501c8685794bf3.tar.gz | |
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
sql/handler.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index b7634b3cf33..237d4ce02de 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1433,9 +1433,9 @@ int handler::read_range_first(const key_range *start_key, start_key->length, start_key->flag); if (result) - DBUG_RETURN((result == HA_ERR_KEY_NOT_FOUND || - result == HA_ERR_END_OF_FILE) ? HA_ERR_END_OF_FILE : - result); + DBUG_RETURN((result == HA_ERR_KEY_NOT_FOUND) + ? HA_ERR_END_OF_FILE + : result); DBUG_RETURN (compare_key(end_range) <= 0 ? 0 : HA_ERR_END_OF_FILE); } |