summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2013-03-14 15:33:25 +0100
committerTor Didriksen <tor.didriksen@oracle.com>2013-03-14 15:33:25 +0100
commitc70ea724107a53d798026b46f9a6403e468d5926 (patch)
treea3fcd24bd28fc55e218bf7c6f9274bfd4b608d9d /sql/sql_lex.h
parent662feebc92d87a936d16f18ce017cfd3aadeb43a (diff)
downloadmariadb-git-c70ea724107a53d798026b46f9a6403e468d5926.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.h3
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