diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-07-20 16:32:13 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-07-20 16:32:13 -0600 |
| commit | b282f4290578f0e8e387fcebcd1641337d2601eb (patch) | |
| tree | b696a6c57f5d204281f851c340f80976b08bb6f7 /sql/sql_class.h | |
| parent | e642692a5d25d7771ecab767be9fb8b369d077da (diff) | |
| parent | b588c6064638bd9245871cd840695854c1454e8b (diff) | |
| download | mariadb-git-b282f4290578f0e8e387fcebcd1641337d2601eb.tar.gz | |
merged
configure.in:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/rpl_sporadic_master.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 5b20c62924a..959460a6f4b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -482,12 +482,13 @@ class select_insert :public select_result { uint save_time_stamp; ulonglong last_insert_id; COPY_INFO info; + bool unions; - select_insert(TABLE *table_par,List<Item> *fields_par,enum_duplicates duplic) + select_insert(TABLE *table_par,List<Item> *fields_par,enum_duplicates duplic, bool u=false) :table(table_par),fields(fields_par), save_time_stamp(0),last_insert_id(0) { bzero((char*) &info,sizeof(info)); - info.handle_duplicates=duplic; + info.handle_duplicates=duplic; unions = u; } ~select_insert(); int prepare(List<Item> &list); @@ -512,8 +513,8 @@ public: HA_CREATE_INFO *create_info_par, List<create_field> &fields_par, List<Key> &keys_par, - List<Item> &select_fields,enum_duplicates duplic) - :select_insert (NULL, &select_fields, duplic), db(db_name), + List<Item> &select_fields,enum_duplicates duplic, bool u=false) + :select_insert (NULL, &select_fields, duplic, u), db(db_name), name(table_name), extra_fields(&fields_par),keys(&keys_par), create_info(create_info_par), lock(0) |