diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-03-15 18:24:15 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-15 18:24:15 +0100 |
commit | d7304375e5e0ce30979c2b92e70eb0effaa30a25 (patch) | |
tree | bb9d05f40e948d4b027f4da9c007c433a16fa1a6 /sql/sql_lex.cc | |
parent | cd29dc98216d822ad701d604b3eda886e1db2aaa (diff) | |
parent | e0f3a0fae98bea144b962ef8dbbe62e0935aebb1 (diff) | |
download | mariadb-git-d7304375e5e0ce30979c2b92e70eb0effaa30a25.tar.gz |
mysql-5.1.73 merge
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r-- | sql/sql_lex.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 6d18ca000c6..fd17770a42c 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1,6 +1,6 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (c) 2009, 2013, Monty Program Ab. + Copyright (c) 2000, 2013, Oracle and/or its affiliates. + Copyright (c) 2009, 2014, Monty Program Ab. 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 @@ -1940,6 +1940,11 @@ bool st_select_lex::add_order_to_list(THD *thd, Item *item, bool asc) } +bool st_select_lex::add_gorder_to_list(THD *thd, Item *item, bool asc) +{ + return add_to_list(thd, gorder_list, item, asc); +} + bool st_select_lex::add_item_to_list(THD *thd, Item *item) { DBUG_ENTER("st_select_lex::add_item_to_list"); |