diff options
| author | unknown <monty@mysql.com> | 2003-11-28 13:31:38 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-11-28 13:31:38 +0200 |
| commit | ef43220170521a90454c05380cc01d562fc98c2f (patch) | |
| tree | 995a8061976a12fd5dfb02679e683b86c743879c /sql/sql_derived.cc | |
| parent | 03092d0c24067bf97359436e49e6cce7ca0e2803 (diff) | |
| parent | 183b02a8ac6074775bd8c33f036eed3cf6597bbe (diff) | |
| download | mariadb-git-ef43220170521a90454c05380cc01d562fc98c2f.tar.gz | |
Merge
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_derived.cc:
keep local copy
sql/sql_union.cc:
keep local copy
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index efc15ffcb18..e8f1c5d87de 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -110,7 +110,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, fix_tables_pointers(unit); } - if(!(derived_result= new select_union(0))) + if (!(derived_result= new select_union(0))) DBUG_RETURN(1); // out of memory // st_select_lex_unit::prepare correctly work for single select @@ -127,7 +127,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, cursor->table->clear_query_id= 1; } - bzero((char*) &derived_result->tmp_table_param, sizeof(TMP_TABLE_PARAM)); + derived_result->tmp_table_param.init(); derived_result->tmp_table_param.field_count= unit->types.elements; /* Temp table is created so that it hounours if UNION without ALL is to be @@ -204,7 +204,6 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, table->file->info(HA_STATUS_VARIABLE); } } - delete derived_result; if (res) free_tmp_table(thd, table); @@ -216,6 +215,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, } exit: + delete derived_result; lex->current_select= save_current_select; close_thread_tables(thd, 0, 1); } |