diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index d8728321e34..e9190b7e75d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,23 +1,24 @@ Miguel@light.local +Sinisa@sinisa.nasamreza.org +arjen@fred.bitbike.com heikki@donna.mysql.fi +heikki@hundin.mysql.fi +jani@hynda.mysql.fi jorge@linux.jorge.mysql.com +lenz@mysql.com +miguel@hegel.local miguel@light.local monty@bitch.mysql.fi monty@donna.mysql.fi monty@hundin.mysql.fi +monty@tik. monty@tik.mysql.fi monty@work.mysql.com mwagner@cash.mwagner.org +nick@nick.leippe.com paul@central.snake.net sasha@mysql.sashanet.com serg@serg.mysql.com -heikki@hundin.mysql.fi -jani@hynda.mysql.fi -miguel@hegel.local -arjen@fred.bitbike.com +serg@sergbook.mysql.com sinisa@rhols221.adsl.netsonic.fi -Sinisa@sinisa.nasamreza.org -nick@nick.leippe.com -monty@tik. zak@balfor.local -lenz@mysql.com 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;