diff options
| author | monty@donna.mysql.fi <> | 2001-03-03 03:03:12 +0200 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-03-03 03:03:12 +0200 |
| commit | 5ccbbd83f29b1057cfbe869259c4cb009b89a9d2 (patch) | |
| tree | cd2f65141c35a1998982970704a3f854a987c568 /sql/filesort.cc | |
| parent | f2d31048eb843d0209bfe4f6e2e2e0b3a57cc6f4 (diff) | |
| download | mariadb-git-5ccbbd83f29b1057cfbe869259c4cb009b89a9d2.tar.gz | |
Fixes for innobase usage
Fixed bug when using TEXT columns with BDB tables
Allow LOAD DATA INFILE to use numbers with ENUM and SET columns
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 4a981040968..e116e2b68e6 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -137,7 +137,8 @@ ha_rows filesort(TABLE **table, SORT_FIELD *sortorder, uint s_length, #ifdef CAN_TRUST_RANGE else if (select && select->quick && select->quick->records > 0L) { - VOID(ha_info(&table[0]->form,0)); /* Get record-count */ + /* Get record-count */ + table[0]->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); records=min((ha_rows) (select->quick->records*2+EXTRA_RECORDS*2), table[0]->file->records)+EXTRA_RECORDS; selected_records_file=0; |