1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge work:/home/bk/mysql

Browse Source 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown 2002-05-26 12:59:02 +02:00
commit af68d3de87
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BitKeeper/etc/logging_ok
View File

@ -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

2
sql/sql_select.cc
View File

@ -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;