summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2001-01-05 23:31:34 +0100
committerserg@serg.mysql.com <>2001-01-05 23:31:34 +0100
commit0b7331710b77e1f23239652c311eb81c26bc8e4f (patch)
treeeec5cfb66123feac695ebe8853213eee6e42b296 /sql/sql_select.cc
parent235323220d35e45f448ac2eac9b2a58f37a9d7b5 (diff)
downloadmariadb-git-0b7331710b77e1f23239652c311eb81c26bc8e4f.tar.gz
sql_select.cc check for cond==NULL in add_ft_keys()
fulltext_left_join.result BitKeeper file /usr/home/serg/Abk/mysql/mysql-test/r/fulltext_left_join.result fulltext_left_join.test BitKeeper file /usr/home/serg/Abk/mysql/mysql-test/t/fulltext_left_join.test
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index fdd4541cfc8..8e11d60fb6e 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1329,6 +1329,9 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array,
{
Item_func_match *cond_func=NULL;
+ if (!cond)
+ return;
+
if (cond->type() == Item::FUNC_ITEM)
{
Item_func *func=(Item_func *)cond,