diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-06-15 17:23:47 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-06-15 17:23:47 +0300 |
| commit | b54c21d57b94248cd256305ce29a0dc1aaafb0fa (patch) | |
| tree | 1d850c6092a814c5c57ded20d5ebfbe7daff5649 /sql/sql_table.cc | |
| parent | d775ecdd010daad4dc6147fba58acd006bf2c60c (diff) | |
| download | mariadb-git-bb-10.0.22-mdev8989.tar.gz | |
Backport of commit 904027c820fb344343de6f68a32bcc889f2bd407 to 10.0.21bb-10.0.22-mdev8989
Commit message was:
Merge branch 'bb-10.1-mdev8989' into 10.1
Some test results are probably not yet updated
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index e0f7184b0e8..9480b0bb12e 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -9373,7 +9373,7 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to, if (thd->lex->select_lex.setup_ref_array(thd, order_num) || setup_order(thd, thd->lex->select_lex.ref_pointer_array, &tables, fields, all_fields, order) || - !(sortorder= make_unireg_sortorder(order, &length, NULL)) || + !(sortorder= make_unireg_sortorder(NULL, 0, order, &length, NULL)) || (from->sort.found_records= filesort(thd, from, sortorder, length, NULL, HA_POS_ERROR, true, |