diff options
| author | unknown <serg@sergbook.mysql.com> | 2002-05-26 12:59:02 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2002-05-26 12:59:02 +0200 |
| commit | af68d3de879a94b2be47ed5e335d5c072692ea2b (patch) | |
| tree | 5f3fb370d149674a5938f85690eda1c1816dc456 /sql/sql_select.cc | |
| parent | 5abc01a898154d9d34bdaabb141d8c3b4b32cf4e (diff) | |
| parent | 85bfbcd7adb594a6cf4704a5f0ff68affd22d349 (diff) | |
| download | mariadb-git-af68d3de879a94b2be47ed5e335d5c072692ea2b.tar.gz | |
Merge work:/home/bk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
auto-union
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index c6339c2c34f..939ec003aca 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2128,7 +2128,7 @@ get_best_combination(JOIN *join) have a 'normal' value or a NULL value. */ j->type=JT_CONST; - if (join->const_tables == tablenr) + if (join->const_tables == tablenr && !form->fulltext_searched) { join->const_tables++; join->const_table_map|=form->map; |