diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-23 19:32:14 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-23 19:32:14 +0200 |
| commit | 7b368e3810feda53fc0dbdf5bfe8863f82f0bbcc (patch) | |
| tree | bab573449ec11585c1b5149c7cbf477178caa469 /sql/sql_lex.cc | |
| parent | c8768a091ac2d876216582813aaab7d9663008f7 (diff) | |
| parent | f28e7bd0645d478d33d7ae3b974931c7991cd0bd (diff) | |
| download | mariadb-git-7b368e3810feda53fc0dbdf5bfe8863f82f0bbcc.tar.gz | |
Merge with MySQL 5.1.60
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 82c375fe045..cbb3782114a 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2007,6 +2007,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 |