diff options
author | Tor Didriksen <tor.didriksen@oracle.com> | 2013-03-14 15:33:25 +0100 |
---|---|---|
committer | Tor Didriksen <tor.didriksen@oracle.com> | 2013-03-14 15:33:25 +0100 |
commit | f4d2b576b831e0dec49a8e729870205d39e305e5 (patch) | |
tree | a3fcd24bd28fc55e218bf7c6f9274bfd4b608d9d /sql/sql_lex.h | |
parent | 17ee332d4ea999ddbba9931ee3042e5723cbc4e5 (diff) | |
download | mariadb-git-f4d2b576b831e0dec49a8e729870205d39e305e5.tar.gz |
Bug#16359402 CRASH WITH AGGREGATES: ASSERTION FAILED: N < M_SIZE
We need to take 'n_sum_items' into the calculation
when allocating the ref_ptr_array.
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 111a22c7ff9..3be4c4111d4 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -731,6 +731,7 @@ public: Item *select_limit, *offset_limit; /* LIMIT clause parameters */ // Arrays of pointers to top elements of all_fields list Item **ref_pointer_array; + size_t ref_pointer_array_size; // Number of elements in array. /* number of items in select_list and HAVING clause used to get number |