summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2005-07-14 16:02:30 +0000
committerunknown <sergefp@mysql.com>2005-07-14 16:02:30 +0000
commit96dcb8c20dbce6561a1e025c5c8a86052771f15b (patch)
tree725c08b2692b3fb19a63d8beb644f7526b9ad436 /sql/item_func.cc
parent86cb32b7b0cf3de0c697e75cfa0f5338601d6eb8 (diff)
parentc0bcf503f5307309104ca4efe4ddbd75fd671e8f (diff)
downloadmariadb-git-96dcb8c20dbce6561a1e025c5c8a86052771f15b.tar.gz
Merge mysql.com:/home/psergey/mysql-4.1-build-tree
into mysql.com:/home/psergey/mysql-4.1-merge-from-build sql/item_func.cc: Auto merged
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 4e0b6d8813f..0128209cb22 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -3209,6 +3209,9 @@ bool Item_func_match::fix_index()
if (key == NO_SUCH_KEY)
return 0;
+
+ if (!table)
+ goto err;
for (keynr=0 ; keynr < table->keys ; keynr++)
{