summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-04-05 16:28:16 +0300
committermonty@mysql.com <>2004-04-05 16:28:16 +0300
commit00135169518ed0953dd53b5ae11e783a850a46ea (patch)
tree2c8ec348c331cb6321acc9ec80f6b07df0a8d51e /sql/sql_lex.h
parent2e22d5442921225f461841e29cc42c05f0a239cf (diff)
parent42cf92ce37c7ce9b7356d04273a858a9e42823b5 (diff)
downloadmariadb-git-00135169518ed0953dd53b5ae11e783a850a46ea.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index c86c7d4a81d..5538fb0e832 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -396,6 +396,7 @@ public:
SQL_LIST order_list; /* ORDER clause */
List<List_item> expr_list;
List<List_item> when_list; /* WHEN clause (expression) */
+ SQL_LIST *gorder_list;
ha_rows select_limit, offset_limit; /* LIMIT clause parameters */
// Arrays of pointers to top elements of all_fields list
Item **ref_pointer_array;
@@ -538,7 +539,6 @@ typedef struct st_lex
gptr yacc_yyss,yacc_yyvs;
THD *thd;
CHARSET_INFO *charset;
- SQL_LIST *gorder_list;
List<key_part_spec> col_list;
List<key_part_spec> ref_list;