1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2003-05-22 09:52:22 +03:00
15 changed files with 439 additions and 311 deletions

View File

@ -352,6 +352,8 @@ public:
bool braces; /* SELECT ... UNION (SELECT ... ) <- this braces */
/* TRUE when having fix field called in processing of this SELECT */
bool having_fix_field;
/* TRUE for fake select, which used in UNION processing */
bool fake_select;
void init_query();
void init_select();
@ -405,7 +407,7 @@ public:
friend void mysql_init_query(THD *thd);
st_select_lex(struct st_lex *lex);
st_select_lex() {}
st_select_lex() :fake_select(0) {}
void make_empty_select(st_select_lex *last_select)
{
select_number=INT_MAX;