diff options
| author | unknown <miguel@hegel.local> | 2004-05-05 02:59:17 -0300 |
|---|---|---|
| committer | unknown <miguel@hegel.local> | 2004-05-05 02:59:17 -0300 |
| commit | 2ebb6f2388cf63b6ceb0f7317092e790eefc1329 (patch) | |
| tree | acaa682ecb4e7413232120ad5965cc6adc2f410c /sql/sql_union.cc | |
| parent | c5d5f1fab9c705f20ee9b175f28c03a89ecaf9f7 (diff) | |
| download | mariadb-git-2ebb6f2388cf63b6ceb0f7317092e790eefc1329.tar.gz | |
Windows fixes for VC++ compiler compability
myisam/myisam_ftdump.c:
VC++ compiler compability fix
mysys/my_getsystime.c:
Applied Sergei's code for Windows (still subject to changes by him)
sql/handler.cc:
VC++ compiler compability fix
sql/item_geofunc.cc:
Removed non-used variable
sql/item_strfunc.cc:
VC++ compiler compability fix
sql/opt_range.cc:
VC++ compiler compability fix
sql/sql_insert.cc:
VC++ compiler compability fix
sql/sql_lex.cc:
VC++ compiler compability fix
sql/sql_parse.cc:
VC++ compiler compability fix
sql/sql_prepare.cc:
VC++ compiler compability fix
sql/sql_union.cc:
Removed non-used variable and VC++ compiler compability fix
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 1b3995f30be..0dcf9f4731b 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -112,7 +112,6 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, SELECT_LEX *lex_select_save= thd_arg->lex->current_select; SELECT_LEX *sl, *first_select; select_result *tmp_result; - ORDER *tmp_order; DBUG_ENTER("st_select_lex_unit::prepare"); /* @@ -215,7 +214,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, union_result->tmp_table_param.field_count= types.elements; if (!(table= create_tmp_table(thd_arg, &union_result->tmp_table_param, types, - (ORDER*) 0, union_distinct, 1, + (ORDER*) 0, (bool) union_distinct, 1, (first_select_in_union()->options | thd_arg->options | TMP_TABLE_ALL_COLUMNS), |