diff options
| author | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-10-17 16:36:44 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-10-17 16:36:44 +0300 |
| commit | c208f46b66c1f1533f09462f0a697a6129fd3881 (patch) | |
| tree | 7ae4f3f12d67f24169a9330a930b5a4b5cae6db3 /sql/mysql_priv.h | |
| parent | d2198ed9f70bdc41b457f83ae2f31e47b2022a9c (diff) | |
| parent | 841ea461ce2b6782ce280806039c32e7a5b7dcdd (diff) | |
| download | mariadb-git-c208f46b66c1f1533f09462f0a697a6129fd3881.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B21798-5.0-opt-merge
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/r/subselect.result:
merge fixes for bug 21798
mysql-test/t/subselect.test:
merge fixes for bug 21798
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 1cee013852e..ea3b3a9bd83 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -714,7 +714,8 @@ bool mysql_xa_recover(THD *thd); bool check_simple_select(); -SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length); +SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length, + SORT_FIELD *sortorder); int setup_order(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, List<Item> &fields, List <Item> &all_fields, ORDER *order); int setup_group(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, |