diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-07-16 22:45:59 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-07-16 22:45:59 +0300 |
| commit | b3905034edf31200567793b8a4c453a2e63edf12 (patch) | |
| tree | 3d50fdb9649350943d1069b28df523b8557debfa /sql/sql_parse.cc | |
| parent | 419cec8d4693db8d051d7bf324c27d977cdc420d (diff) | |
| parent | 63a49b788669b23da48029774e931621aae2dc51 (diff) | |
| download | mariadb-git-b3905034edf31200567793b8a4c453a2e63edf12.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_lex.h:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 6f5d0bf03a1..558e1e6d1fd 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2730,7 +2730,9 @@ mysql_init_select(LEX *lex) select_lex->offset_limit=0; select_lex->options=0; select_lex->linkage=UNSPECIFIED_TYPE; + select_lex->olap= NON_EXISTING_ONE; lex->exchange = 0; + lex->olap = 0; lex->proc_list.first=0; select_lex->order_list.elements=select_lex->group_list.elements=0; select_lex->order_list.first=0; @@ -3272,6 +3274,7 @@ static bool create_total_list(THD *thd, LEX *lex, TABLE_LIST **result) for (; aux; aux=next) { TABLE_LIST *cursor; + aux->do_redirect=true; next= aux->next; for (cursor= *result; cursor; cursor=cursor->next) if (!strcmp(cursor->db,aux->db) && |