mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
59516 commits 2789 branches 343 tags 1.7 GiB
Commit graph

2 commits

Author SHA1 Message Date
unknown
66a1902a01 After-merge fixes for merge of MySQL-5.1.38. 
mysql-test/r/innodb.result:
  Fix wrong merge of result file conflicts.
mysql-test/t/bug46080-master.opt:
  Fix memory limit to take into account extra storage engines in MariaDB.
mysql-test/t/innodb.test:
  Add comment clarifying tricky --replace_result.
sql/sql_select.cc:
  Restore fix of Bug#34374, accudentally lost during MySQL 5.1.38 merge.
support-files/build-tags:
  Fix missing -R option for bzr, accidentally lost in MySQL-5.1.38 merge.
 2009-09-11 13:00:53 +02:00
Georgi Kodinov
5beae1f8dc Bug #46080: group_concat(... order by) crashes server when 
sort_buffer_size cannot allocate

The NULL return from tree_insert() (on low memory) was not
checked for in Item_func_group_concat::add(). As a result
on low memory conditions a crash happens.

Fixed by properly checking the return code.
 2009-07-10 15:00:34 +03:00