diff options
| author | dlenev@mysql.com <> | 2006-02-27 20:00:07 +0300 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2006-02-27 20:00:07 +0300 |
| commit | 8dbdf5237ecae0a8866195b1c12972fc1460b461 (patch) | |
| tree | 0fde704b3ac2031c62de8957626945f2239d8343 /sql/sql_select.h | |
| parent | 1f30b1525ad2f3d22d7373f5785691269be1db5c (diff) | |
| parent | 3d6839d133e499dde697e180dc9ee48a129cf34b (diff) | |
| download | mariadb-git-8dbdf5237ecae0a8866195b1c12972fc1460b461.tar.gz | |
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 02ee672b66e..459d2ff89a8 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -176,7 +176,9 @@ typedef struct st_rollup class JOIN :public Sql_alloc { - public: + JOIN(const JOIN &rhs); /* not implemented */ + JOIN& operator=(const JOIN &rhs); /* not implemented */ +public: JOIN_TAB *join_tab,**best_ref; JOIN_TAB **map2table; // mapping between table indexes and JOIN_TABs JOIN_TAB *join_tab_save; // saved join_tab for subquery reexecution @@ -288,13 +290,6 @@ class JOIN :public Sql_alloc init(thd_arg, fields_arg, select_options_arg, result_arg); } - JOIN(JOIN &join) - :Sql_alloc(), fields_list(join.fields_list) - { - init(join.thd, join.fields_list, join.select_options, - join.result); - } - void init(THD *thd_arg, List<Item> &fields_arg, ulonglong select_options_arg, select_result *result_arg) { |