diff options
author | unknown <sergefp@mysql.com> | 2005-11-03 16:21:21 +0300 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2005-11-03 16:21:21 +0300 |
commit | 8c72f9bdd1bcf164ade967fa0355cc9664cd570f (patch) | |
tree | 6561df9fed9e9886f7f175ea9f066cf8aef66fd3 /sql/sql_prepare.cc | |
parent | c03c3228533348b4befbbb4da6c7ad965506ee0b (diff) | |
parent | 6527176123361a9302340a9eb1fef55013c2157f (diff) | |
download | mariadb-git-8c72f9bdd1bcf164ade967fa0355cc9664cd570f.tar.gz |
Merge mysql.com:/home/psergey/mysql-5.0-bug14026-r2
into mysql.com:/home/psergey/mysql-5.0-oct03-push
mysql-test/r/join_nested.result:
Auto merged
mysql-test/t/join_nested.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 0d0afb5ca7d..ced862170ec 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2109,8 +2109,6 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) were closed in the end of previous prepare or execute call. */ tables->table= 0; - if (tables->nested_join) - tables->nested_join->counter= 0; if (tables->prep_on_expr) { |