diff options
| author | monty@narttu.mysql.fi <> | 2003-02-26 01:03:47 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-02-26 01:03:47 +0200 |
| commit | 9a46698e1efe164ac17ce0ca82b8e8ed12892c09 (patch) | |
| tree | c9b14451b3f66dc4b11dc35d49edd35f23787e07 /sql/sql_handler.cc | |
| parent | f4e1a2f292a03f4d9b5072365ef6e9ebac1cb595 (diff) | |
| parent | 045ac4b84b783fd93edd45abdd63b87a04584987 (diff) | |
| download | mariadb-git-9a46698e1efe164ac17ce0ca82b8e8ed12892c09.tar.gz | |
Merge with 4.0.11
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 0505d2409d4..7c07c08bcac 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -163,10 +163,13 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, { switch (mode) { case RFIRST: - err=keyname ? - table->file->index_first(table->record[0]) : - table->file->rnd_init(1) || - table->file->rnd_next(table->record[0]); + if (keyname) + err=table->file->index_first(table->record[0]); + else + { + if (!(err=table->file->rnd_init(1))) + err=table->file->rnd_next(table->record[0]); + } mode=RNEXT; break; case RLAST: |