summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorram@gw.mysql.r18.ru <>2004-12-20 13:47:38 +0400
committerram@gw.mysql.r18.ru <>2004-12-20 13:47:38 +0400
commitda562b7e02aea6ed239d3c1a5a84ffe46fbf3e53 (patch)
treedd0a3f49fc7ab81f955a8db5b6daeb55c9c25e2e /sql/item_func.cc
parent9f5f59532c9eeb09269e7318b21b0a1bbbe39625 (diff)
downloadmariadb-git-da562b7e02aea6ed239d3c1a5a84ffe46fbf3e53.tar.gz
A fix (bug #7281: RAND(RAND) crashes server).
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 2d939f47716..3c565d0c466 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1091,7 +1091,8 @@ double Item_func_round::val()
bool Item_func_rand::fix_fields(THD *thd, struct st_table_list *tables,
Item **ref)
{
- Item_real_func::fix_fields(thd, tables, ref);
+ if (Item_real_func::fix_fields(thd, tables, ref))
+ return TRUE;
used_tables_cache|= RAND_TABLE_BIT;
if (arg_count)
{ // Only use argument once in query