mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
Fix bug #12861 client hang with group_concat insubquery FROM DUAL.
Item_func_group_concat::fix_fields() set maybe_null flag to 0, and set it to 1 only if some of it's arguments may be null. When used in subquery in tmp table created field which can't be null. When no data retireved result field have to be set to null and error mentioned in bug report occurs. Also this bug can occur if selecting from not null field in empty table. Function group_concat now marked maybe_null from the very beginning not only if some of it's argument may be null.
This commit is contained in:
parent
b5c01d7971
commit
f1fb30a15f
3 changed files with 9 additions and 3 deletions
|
@ -548,3 +548,6 @@ FROM t1 JOIN t2 ON t1.bID = t2.bID;
|
|||
COUNT(*) GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |')
|
||||
2 test
|
||||
DROP TABLE t1,t2;
|
||||
select * from (select group_concat('c') from DUAL) t;
|
||||
group_concat('c')
|
||||
NULL
|
||||
|
|
|
@ -343,4 +343,9 @@ SELECT COUNT(*), GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |')
|
|||
|
||||
DROP TABLE t1,t2;
|
||||
|
||||
#
|
||||
# Bug #12861 hang with group_concat insubquery FROM DUAL
|
||||
#
|
||||
select * from (select group_concat('c') from DUAL) t;
|
||||
|
||||
# End of 4.1 tests
|
||||
|
|
|
@ -1916,7 +1916,7 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
|
|||
}
|
||||
|
||||
thd->allow_sum_func= 0;
|
||||
maybe_null= 0;
|
||||
maybe_null= 1;
|
||||
item_thd= thd;
|
||||
|
||||
/*
|
||||
|
@ -1929,8 +1929,6 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
|
|||
args[i]->fix_fields(thd, tables, args + i)) ||
|
||||
args[i]->check_cols(1))
|
||||
return 1;
|
||||
if (i < arg_count_field)
|
||||
maybe_null|= args[i]->maybe_null;
|
||||
}
|
||||
|
||||
if (agg_item_charsets(collation, func_name(),
|
||||
|
|
Loading…
Reference in a new issue