diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-08-30 13:23:59 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-08-30 13:23:59 -0600 |
| commit | 89d3d585112fd71d62bcac511dab6530b6df793e (patch) | |
| tree | 8a9eb637bc86a49e83f7ac315d1483f381fea0a2 /sql/sql_lex.h | |
| parent | 674f49f8f415c35b37660d85234e268bd3bd03ef (diff) | |
| parent | 88cf551a16af65e6b5e1396a31447e9b38cd5519 (diff) | |
| download | mariadb-git-89d3d585112fd71d62bcac511dab6530b6df793e.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
client/mysql.cc:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 057d59d3ccf..da0134a7f72 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -596,7 +596,6 @@ public: const char *type; /* type of select for EXPLAIN */ SQL_LIST order_list; /* ORDER clause */ - List<List_item> expr_list; SQL_LIST *gorder_list; Item *select_limit, *offset_limit; /* LIMIT clause parameters */ // Arrays of pointers to top elements of all_fields list |