← Back to branch summary

~mysql/mysql-server/mysql-6.0

« back to all changes in this revision

Viewing changes to sql/sql_union.cc

  • Committer: monty at mysql
  • Date: 2002-12-05 17:38:42 UTC
  • mfrom: (1346.7.103)
  • mto: (1388.1.1)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: sp1r-monty@mashka.mysql.fi-20021205173842-56440
Merge with 4.0.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_union.cc
41
41
***************************************************************************/
42
42
 
43
43
select_union::select_union(TABLE *table_par)
44
 
    :table(table_par)
 
44
  :table(table_par), not_describe(0)
45
45
{
46
46
  bzero((char*) &info,sizeof(info));
47
47
  /*
59
59
int select_union::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
60
60
{
61
61
  unit= u;
62
 
  if (save_time_stamp && list.elements != table->fields)
 
62
  if (not_describe && list.elements != table->fields)
63
63
  {
64
64
    my_message(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT,
65
65
               ER(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT),MYF(0));
117
117
  prepared= 1;
118
118
  union_result=0;
119
119
  res= 0;
120
 
  found_rows_for_union= false;
 
120
  found_rows_for_union= 0;
121
121
  TMP_TABLE_PARAM tmp_table_param;
122
122
  this->thd= thd;
123
123
  this->result= result;
165
165
  if (!(union_result=new select_union(table)))
166
166
    goto err;
167
167
 
168
 
  union_result->save_time_stamp=1;
 
168
  union_result->not_describe=1;
169
169
  union_result->tmp_table_param=&tmp_table_param;
170
170
 
171
171
  // prepare selects