diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-02-26 00:22:35 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-02-26 00:22:35 +0200 |
| commit | b9c69c1609ad2590b6c0130c0d3fcc5e7a033e76 (patch) | |
| tree | 7ab76a019795a4806b97cb19efc02d2efcfaff5e /sql/sql_analyse.h | |
| parent | 6e2ee18779d86b12d2c61a10fba4a1ced1ac0b8e (diff) | |
| parent | 21f2382b283e9676f58d61ac744dd744e153239a (diff) | |
| download | mariadb-git-b9c69c1609ad2590b6c0130c0d3fcc5e7a033e76.tar.gz | |
merge with 3.23 to get corrected error message files and rename of files in mysql-test
innobase/ibuf/ibuf0ibuf.c:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_analyse.h:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
mysql-test/t/rpl000015.slave-mi:
Auto merged
mysql-test/t/rpl_rotate_logs.slave-mi:
Auto merged
mysql-test/mysql-test-run.sh:
merge with 3.23
scripts/make_binary_distribution.sh:
merge with 3.23
sql/share/czech/errmsg.txt:
merge with 3.23
sql/share/danish/errmsg.txt:
merge with 3.23
sql/share/dutch/errmsg.txt:
merge with 3.23
sql/share/estonian/errmsg.txt:
merge with 3.23
sql/share/swedish/errmsg.txt:
merge with 3.23
sql/sql_class.cc:
merge with 3.23 (Keep local copy)
Diffstat (limited to 'sql/sql_analyse.h')
| -rw-r--r-- | sql/sql_analyse.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sql/sql_analyse.h b/sql/sql_analyse.h index 1c60d0c150f..aa6d0dbb2d1 100644 --- a/sql/sql_analyse.h +++ b/sql/sql_analyse.h @@ -297,13 +297,16 @@ 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); |