diff options
| author | unknown <hf@deer.(none)> | 2003-11-21 11:58:28 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-11-21 11:58:28 +0400 |
| commit | 95c6226af717ed5fad0ea013d4c75433743c1156 (patch) | |
| tree | 1958030cb2e4fd7b1e8695db55ab95957c4c1eab /sql/sql_lex.cc | |
| parent | 8848cea28797c2e08898bbcb782b6c830ee3f42e (diff) | |
| parent | e2661bdbba9d81f00fb6ef5bdfeee343b3496ee2 (diff) | |
| download | mariadb-git-95c6226af717ed5fad0ea013d4c75433743c1156.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.1727
mysql-test/r/derived.result:
Auto merged
mysql-test/t/derived.test:
Auto merged
sql/sql_lex.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 981e5e1e026..9b74073b64e 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1270,28 +1270,6 @@ bool st_select_lex::test_limit() return(0); } - - - - - - - - - - - - - - - - - - - - - - /* Interface method of table list creation for query @@ -1316,13 +1294,8 @@ bool st_select_lex_unit::create_total_list(THD *thd, st_lex *lex, bool check_derived) { *result= 0; - for (SELECT_LEX_UNIT *unit= this; unit; unit= unit->next_unit()) - { - if ((res= unit->create_total_list_n_last_return(thd, lex, &result, - check_derived))) - return res; - } - return 0; + res= create_total_list_n_last_return(thd, lex, &result, check_derived); + return res; } /* |