diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2011-07-11 11:27:52 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2011-07-11 11:27:52 +0200 |
| commit | 75ba465c361bb54db4882590ebc8879549fee15c (patch) | |
| tree | 8ecb7d1d4c9dc01076ed94b5c263a0c8654c1834 /sql/sql_lex.cc | |
| parent | 67ab58000ae93ed9a9c86090a0fbb3936a231301 (diff) | |
| parent | 9827d4aa638c706041966efc49a3ac5a5726b4bf (diff) | |
| download | mariadb-git-75ba465c361bb54db4882590ebc8879549fee15c.tar.gz | |
merge 5.1-security => 5.5-security
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 44c7879694b..62fb6fc94b5 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2120,6 +2120,9 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num) if (ref_pointer_array) return 0; + // find_order_in_list() may need some extra space, so multiply by two. + order_group_num*= 2; + /* We have to create array in prepared statement memory if it is prepared statement |