diff options
| author | unknown <sergefp@mysql.com> | 2005-05-03 10:23:10 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-05-03 10:23:10 +0400 |
| commit | f5955f4d872db92ada4574ff761bca732fe8bb41 (patch) | |
| tree | 7fdbad4948a3194b69b93b90997e6f4204c0eec7 /sql/sql_select.cc | |
| parent | 4471eb92fa761aa066036d828388f36a0cc14a0a (diff) | |
| parent | 58334f8360065ba62931376f98c2f267d6115a99 (diff) | |
| download | mariadb-git-f5955f4d872db92ada4574ff761bca732fe8bb41.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-test-valgrind
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 18172eb1f03..32624bb3305 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -11002,7 +11002,8 @@ create_sort_index(THD *thd, JOIN *join, ORDER *order, */ if (!(select->quick= (tab->type == JT_FT ? new FT_SELECT(thd, table, tab->ref.key) : - get_quick_select_for_ref(thd, table, &tab->ref)))) + get_quick_select_for_ref(thd, table, &tab->ref, + tab->found_records)))) goto err; } } |