diff options
author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-12-04 12:51:26 -0500 |
---|---|---|
committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-12-04 12:51:26 -0500 |
commit | af20ca6b668756f666165c4cea5155cadb68e6d7 (patch) | |
tree | 34dd4c083178bcac366aeea05f2f4efd4fb0c177 /sql/sql_class.h | |
parent | 298b1174dc57971467c1af01df936503577f05f2 (diff) | |
parent | 1c49e88e4c2ce5df1673f3df804fae089175f2cf (diff) | |
download | mariadb-git-af20ca6b668756f666165c4cea5155cadb68e6d7.tar.gz |
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
mysql-test/r/distinct.result:
Auto merged
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 2cf7de5ee9e..ef01f613581 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2170,9 +2170,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); |