diff options
| author | unknown <mskold@mysql.com> | 2004-09-11 20:56:06 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2004-09-11 20:56:06 +0200 |
| commit | 180abf8338e848c332d6c7f84866e59d0952cf12 (patch) | |
| tree | 4ec18c131658741e369ea454678e1211b484effd /sql/handler.cc | |
| parent | 3ffc483275d6b8e733ddd98d534263f6f533cc9d (diff) | |
| parent | 387df2f6a53f25a2a360f2b8d9fec49dba541dbe (diff) | |
| download | mariadb-git-180abf8338e848c332d6c7f84866e59d0952cf12.tar.gz | |
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/mgmcommon/LocalConfig.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/Ndbif.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
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 c7c480a80fa..859c7124566 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1434,9 +1434,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); } |