← 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-03 15:44:55 UTC
  • mfrom: (2318.8.15 refactor2)
  • Revision ID: me@mark.atwood.name-20110803154455-jqg3gnxofkq8wetv
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
362
362
                                          create_options, ""))
363
363
      goto err;
364
364
    memset(&result_table_list, 0, sizeof(result_table_list));
365
 
    result_table_list.setSchemaName((char*) "");
 
365
    result_table_list.setSchemaName("", 0);
366
366
    result_table_list.alias= "union";
367
 
    result_table_list.setTableName((char *) "union");
 
367
    result_table_list.setTableName("union", 5);
368
368
    result_table_list.table= table= union_result->table;
369
369
 
370
370
    session_arg->lex().current_select= lex_select_save;