diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:31:51 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:31:51 +0400 |
| commit | cc6dabba377bd05bb9a6a9ffaa985bbe5e38bcc1 (patch) | |
| tree | 9413ba739bc0dbf1e647293756a3503f17dcde07 /sql/sql_parse.h | |
| parent | 91a7b147056a228804f81726127035aa305702ff (diff) | |
| parent | 45c7bf3c54fa852b312773688fdce15bffe49abf (diff) | |
| download | mariadb-git-cc6dabba377bd05bb9a6a9ffaa985bbe5e38bcc1.tar.gz | |
Merge trunk-bugfixing -> trunk-runtime
Diffstat (limited to 'sql/sql_parse.h')
| -rw-r--r-- | sql/sql_parse.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.h b/sql/sql_parse.h index c9264b999b3..df76df72e09 100644 --- a/sql/sql_parse.h +++ b/sql/sql_parse.h @@ -116,7 +116,7 @@ bool add_field_to_list(THD *thd, LEX_STRING *field_name, enum enum_field_types t char *change, List<String> *interval_list, CHARSET_INFO *cs, uint uint_geom_type); -bool add_to_list(THD *thd, SQL_LIST &list,Item *group,bool asc); +bool add_to_list(THD *thd, SQL_I_List<ORDER> &list, Item *group, bool asc); void add_join_on(TABLE_LIST *b,Item *expr); void add_join_natural(TABLE_LIST *a,TABLE_LIST *b,List<String> *using_fields, SELECT_LEX *lex); |