diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-05-05 21:24:13 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-05-05 21:24:13 +0300 |
| commit | 2c95f97c2beea7b88378623d9655fcf2ad88a9a9 (patch) | |
| tree | b08dcc78213fe6542cd07701d30fdab61f2ac232 /sql/sql_lex.cc | |
| parent | b30d0883b1e87df5a476a9e48542321de4384aa4 (diff) | |
| parent | f6428e8bb9ac0cad24465513c5969a50cd13f6f2 (diff) | |
| download | mariadb-git-2c95f97c2beea7b88378623d9655fcf2ad88a9a9.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
mysql-test/r/subselect.result:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 63247a64319..5fa8b37285e 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1023,6 +1023,7 @@ void st_select_lex::init_query() ref_pointer_array= 0; select_n_having_items= 0; prep_where= 0; + explicit_limit= 0; } void st_select_lex::init_select() @@ -1616,10 +1617,7 @@ void st_select_lex::print_limit(THD *thd, String *str) if (!thd) thd= current_thd; - if ((select_limit != thd->variables.select_limit && - this == &thd->lex->select_lex) || - (select_limit != HA_POS_ERROR && this != &thd->lex->select_lex) || - offset_limit != 0L) + if (explicit_limit) { str->append(" limit ", 7); char buff[20]; |