diff options
| author | bell@sanja.is.com.ua <> | 2003-02-16 20:37:51 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2003-02-16 20:37:51 +0200 |
| commit | 6ce8e1e7046df712f442ea96d568f5b21eeb5511 (patch) | |
| tree | 49124c9d7a4d500f48cad2744d46b5f87542783b /sql/sql_analyse.h | |
| parent | 0ceba0e5cf02de3a8acb2578bbe2000b1bc1f7ae (diff) | |
| download | mariadb-git-6ce8e1e7046df712f442ea96d568f5b21eeb5511.tar.gz | |
fixed excluding st_select_lex from global select list
fixed destroing not well constructed analize object
fixed wrong detection of unions in derived tables
Diffstat (limited to 'sql/sql_analyse.h')
| -rw-r--r-- | sql/sql_analyse.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_analyse.h b/sql/sql_analyse.h index ada46374a15..5f0058c3ad9 100644 --- a/sql/sql_analyse.h +++ b/sql/sql_analyse.h @@ -306,13 +306,14 @@ protected: public: uint max_tree_elements, max_treemem; - analyse(select_result *res) :Procedure(res, PROC_NO_SORT), rows(0), - output_str_length(0) {} + analyse(select_result *res) :Procedure(res, PROC_NO_SORT), f_info(0), + rows(0), output_str_length(0) {} ~analyse() - { - for (field_info **f=f_info; f != f_end; f++) - delete (*f); + { + if (f_info) + for (field_info **f=f_info; f != f_end; f++) + delete (*f); } virtual void add() {} virtual bool change_columns(List<Item> &fields); |