mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge
sql/sql_select.cc: Auto merged Docs/manual.texi: SCCS merged
This commit is contained in:
@ -1457,7 +1457,7 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array,
|
||||
{
|
||||
Item *item;
|
||||
/*
|
||||
I, (Sergei) too lazy to implement proper recursive descent here,
|
||||
I'm (Sergei) too lazy to implement proper recursive descent here,
|
||||
and anyway, nobody will use such a stupid queries
|
||||
that will require it :-)
|
||||
May be later...
|
||||
@ -1474,7 +1474,7 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array,
|
||||
}
|
||||
}
|
||||
|
||||
if (!cond_func)
|
||||
if (!cond_func || cond_func->key == NO_SUCH_KEY)
|
||||
return;
|
||||
|
||||
KEYUSE keyuse;
|
||||
|
Reference in New Issue
Block a user