← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
355
355
      }
356
356
    }
357
357
 
358
 
    create_options= (first_sl->options | session_arg->options |
359
 
                     TMP_TABLE_ALL_COLUMNS);
 
358
    create_options= first_sl->options | session_arg->options | TMP_TABLE_ALL_COLUMNS;
360
359
 
361
 
    if (union_result->create_result_table(session, &types, test(union_distinct),
362
 
                                          create_options, ""))
 
360
    if (union_result->create_result_table(session, &types, test(union_distinct), create_options, ""))
363
361
      goto err;
364
362
    memset(&result_table_list, 0, sizeof(result_table_list));
365
 
    result_table_list.setSchemaName("", 0);
 
363
    result_table_list.setSchemaName("");
366
364
    result_table_list.alias= "union";
367
 
    result_table_list.setTableName("union", 5);
 
365
    result_table_list.setTableName("union");
368
366
    result_table_list.table= table= union_result->table;
369
367
 
370
368
    session_arg->lex().current_select= lex_select_save;