diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2006-12-11 17:15:08 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2006-12-11 17:15:08 -0700 |
| commit | 1ec10680377e7f51c64eebd187dd57aa85910646 (patch) | |
| tree | b4152d377676081367af5e4db971e0d67cab54a1 /sql/sql_lex.h | |
| parent | 3d5c638b521c48986f1759387ffd4465c3d7d954 (diff) | |
| parent | c01c4cc3590a619d907544d7bdb3f9a4bd523ce1 (diff) | |
| download | mariadb-git-1ec10680377e7f51c64eebd187dd57aa85910646.tar.gz | |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.0-19194
sql/sp_head.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 5f968252cc3..bee48580a8e 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -518,7 +518,6 @@ public: SQL_LIST order_list; /* ORDER clause */ List<List_item> expr_list; - List<List_item> when_list; /* WHEN clause (expression) */ SQL_LIST *gorder_list; Item *select_limit, *offset_limit; /* LIMIT clause parameters */ // Arrays of pointers to top elements of all_fields list |