diff options
author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-12-04 15:30:55 -0500 |
---|---|---|
committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-12-04 15:30:55 -0500 |
commit | 23a30bdb1d139bf483d3cbe28a31a4e3e14cd899 (patch) | |
tree | 30ac7d827eac6887403f649acbac7ae22998bf6c /sql/sql_class.h | |
parent | a12fff7315effaecf741770665137e05f0a2e623 (diff) | |
parent | af20ca6b668756f666165c4cea5155cadb68e6d7 (diff) | |
download | mariadb-git-23a30bdb1d139bf483d3cbe28a31a4e3e14cd899.tar.gz |
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 218c56959a3..20f1f680fb2 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2181,9 +2181,7 @@ class select_dumpvar :public select_result_interceptor { ha_rows row_count; public: List<my_var> var_list; - List<Item_func_set_user_var> vars; - List<Item_splocal> local_vars; - select_dumpvar(void) { var_list.empty(); local_vars.empty(); vars.empty(); row_count=0;} + select_dumpvar() { var_list.empty(); row_count= 0;} ~select_dumpvar() {} int prepare(List<Item> &list, SELECT_LEX_UNIT *u); bool send_data(List<Item> &items); |