diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-25 02:27:02 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-25 02:27:02 +0200 |
| commit | a352372170815bebd65755bc5fff00fdf964cf9b (patch) | |
| tree | 64b87aad2e52257f0c6cb4d27336e0d1fb516494 /sql/handler.cc | |
| parent | f88d01932f4a81682267e21022686d3dea4edb78 (diff) | |
| parent | 00899088a5f576721ecbf3ca235cdfcd691c8a0e (diff) | |
| download | mariadb-git-a352372170815bebd65755bc5fff00fdf964cf9b.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-join-5.0
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 3c5244927d4..b474e6290f2 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -970,8 +970,10 @@ int handler::read_first_row(byte * buf, uint primary_key) /* If there is very few deleted rows in the table, find the first row by scanning the table. + TODO remove the test for HA_READ_ORDER */ - if (deleted < 10 || primary_key >= MAX_KEY) + if (deleted < 10 || primary_key >= MAX_KEY || + !(index_flags(primary_key, 0, 0) & HA_READ_ORDER)) { (void) ha_rnd_init(1); while ((error= rnd_next(buf)) == HA_ERR_RECORD_DELETED) ; |