diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-04-07 15:23:05 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-04-07 15:23:05 +0300 |
| commit | 0948f9769b3e3da2e064e65015b86644af4acd78 (patch) | |
| tree | c7d0df7f0334621904d6713b3ea5f4ba1c9cefbe /sql/sql_lex.h | |
| parent | 08594c4795d9e673f8f514142489ce01954deba5 (diff) | |
| parent | 91fb27a3ca13beffcfec0fef93f12c580bad260f (diff) | |
| download | mariadb-git-0948f9769b3e3da2e064e65015b86644af4acd78.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
mysql-test/r/union.result:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 2 |
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; |