summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.h
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-01-21 13:55:26 +0200
committerunknown <bell@sanja.is.com.ua>2003-01-21 13:55:26 +0200
commit8a3d3a539fa3aa2967c76c3eb59033a13524aeed (patch)
tree9e72427611ac5057a8bf3051e0bd43678e33a8a2 /sql/item_cmpfunc.h
parent3ffd7865b02a37569f955e40505f2f6b46cbe7a0 (diff)
downloadmariadb-git-8a3d3a539fa3aa2967c76c3eb59033a13524aeed.tar.gz
fixed test of cardinality
mysql-test/r/subselect.result: test of cardinality error mysql-test/t/subselect.test: test of cardinality error
Diffstat (limited to 'sql/item_cmpfunc.h')
-rw-r--r--sql/item_cmpfunc.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index bd7d1bfaf7a..8641ab410b3 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -275,8 +275,7 @@ public:
longlong val_int();
bool fix_fields(THD *thd, struct st_table_list *tlist, Item **ref)
{
- return (item->check_cols(1) ||
- item->fix_fields(thd, tlist, &item) ||
+ return (item->fix_fields(thd, tlist, &item) || item->check_cols(1) ||
Item_func::fix_fields(thd, tlist, ref));
}
void fix_length_and_dec();