prevented crash on deleting non-constructed analyse object

e674c647 · unknown · 31d43a5e · e674c647
Commit e674c647 authored Feb 18, 2003 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

sql/sql_analyse.h sql/sql_analyse.h +6 -5

No files found.
--- a/sql/sql_analyse.h
+++ b/sql/sql_analyse.h
@@ -288,13 +288,14 @@ protected:
 public:
  uint max_tree_elements, max_treemem;
-  analyse(select_result *res) :Procedure(res, PROC_NO_SORT), rows(0),
+  analyse(select_result *res) :Procedure(res, PROC_NO_SORT), f_info(0),
-    output_str_length(0) {}
+    rows(0), output_str_length(0) {}
  ~analyse()
-  { 
+  {
-    for (field_info **f=f_info; f != f_end; f++)
+    if (f_info)
-      delete (*f);
+      for (field_info **f=f_info; f != f_end; f++)
+	delete (*f);
  }
  virtual void add() {}
  virtual bool change_columns(List<Item> &fields);