diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index bd35c33892e..04eef3cd442 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -16,3 +16,4 @@ jani@hynda.mysql.fi miguel@hegel.local arjen@fred.bitbike.com sinisa@rhols221.adsl.netsonic.fi +serg@sergbook.mysql.com diff --git a/sql/sql_select.cc b/sql/sql_select.cc index c4383cbb09f..c92463d65bd 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; |