diff options
| author | unknown <ingo@mysql.com> | 2005-11-15 16:07:05 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-11-15 16:07:05 +0100 |
| commit | b0a5184d80ecf985a53830184b48e4b11532b3e6 (patch) | |
| tree | 9cc0a95cc0f7b689783f201f550cf8b48702860e /sql/sql_select.cc | |
| parent | dc44851352f68e240074ecc571216a8c2503ae0b (diff) | |
| parent | 5412ee4f299a4a2d71db1b7e5f3e62132032fb00 (diff) | |
| download | mariadb-git-b0a5184d80ecf985a53830184b48e4b11532b3e6.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0-bug14616
into mysql.com:/home/mydev/mysql-4.1-4100
mysql-test/r/myisam.result:
Bug#14616 - Freshly imported table returns error 124 when using LIMIT
Manual merge.
mysql-test/t/myisam.test:
Bug#14616 - Freshly imported table returns error 124 when using LIMIT
Manual merge.
sql/sql_select.cc:
Bug#14616 - Freshly imported table returns error 124 when using LIMIT
Manual merge.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5ef3f4d9fda..5e29c98e2c8 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7354,8 +7354,12 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit, DBUG_ENTER("test_if_skip_sort_order"); LINT_INIT(ref_key_parts); - /* Check which keys can be used to resolve ORDER BY */ - usable_keys.set_all(); + /* + Check which keys can be used to resolve ORDER BY. + We must not try to use disabled keys. + */ + usable_keys= table->keys_in_use; + for (ORDER *tmp_order=order; tmp_order ; tmp_order=tmp_order->next) { if ((*tmp_order->item)->type() != Item::FIELD_ITEM) |