diff options
| author | Chaithra Gopalareddy <chaithra.gopalareddy@oracle.com> | 2013-04-14 08:09:56 +0530 |
|---|---|---|
| committer | Chaithra Gopalareddy <chaithra.gopalareddy@oracle.com> | 2013-04-14 08:09:56 +0530 |
| commit | fcb0ecfae344837aa5de0f2e54ea43a967961d40 (patch) | |
| tree | 5bd51666d56f778fdcccf91f137acc096e78d70a /sql/sql_lex.h | |
| parent | 40360f0259228732991eacecbd5a0866aa72ec0a (diff) | |
| parent | 4db726c0fa37ae57054a1b2530a83c278b33f538 (diff) | |
| download | mariadb-git-fcb0ecfae344837aa5de0f2e54ea43a967961d40.tar.gz | |
Merge from 5.1 to 5.5
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 3be4c4111d4..e4fd6f42a48 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2013, 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 @@ -727,7 +728,7 @@ public: const char *type; /* type of select for EXPLAIN */ SQL_I_List<ORDER> order_list; /* ORDER clause */ - SQL_I_List<ORDER> *gorder_list; + SQL_I_List<ORDER> gorder_list; Item *select_limit, *offset_limit; /* LIMIT clause parameters */ // Arrays of pointers to top elements of all_fields list Item **ref_pointer_array; @@ -850,6 +851,7 @@ public: bool add_group_to_list(THD *thd, Item *item, bool asc); bool add_ftfunc_to_list(Item_func_match *func); bool add_order_to_list(THD *thd, Item *item, bool asc); + bool add_gorder_to_list(THD *thd, Item *item, bool asc); TABLE_LIST* add_table_to_list(THD *thd, Table_ident *table, LEX_STRING *alias, ulong table_options, |