summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2003-10-21 15:14:06 +0500
committerunknown <gluh@gluh.mysql.r18.ru>2003-10-21 15:14:06 +0500
commit42de9a3ed95af04abfb0a77b79bddd6f2327d6b9 (patch)
tree8ef0c5224c2298c3260a5f59bcc83154a6f45f91 /sql/item_func.cc
parent14affe7e2fa5287aa205353e80615d089861a104 (diff)
downloadmariadb-git-42de9a3ed95af04abfb0a77b79bddd6f2327d6b9.tar.gz
Fix for bug #1271: Undefined variable in PASSWORD() function is not
handled correctly
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index fd6d17d0cf2..8d7ee637d73 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2087,7 +2087,7 @@ void Item_func_get_user_var::fix_length_and_dec()
bool Item_func_get_user_var::const_item() const
{
- return var_entry && current_thd->query_id != var_entry->update_query_id;
+ return (!var_entry || current_thd->query_id != var_entry->update_query_id);
}