Commit 885176d3 authored by unknown's avatar unknown

Some Windows compile improvements:

 - removed some unreferenced variables
 - fixed the libmysql project file by removing a duplicate file reference (merge error)


sql/item_func.cc:
  - removed unused variable "Field" from Item_func_sp::sp_result_field
sql/sql_select.cc:
  - removed unreferenced variable "filename" from create_tmp_table
sql/unireg.cc:
  - removed unused variable "firstpos" from make_empty_rec
VC++Files/libmysql/libmysql.dsp:
  - after-merge fix: removed duplicate file ctype-cp932.c
parent 5f1f9fcf
...@@ -147,10 +147,6 @@ SOURCE="..\strings\ctype-czech.c" ...@@ -147,10 +147,6 @@ SOURCE="..\strings\ctype-czech.c"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE="..\strings\ctype-cp932.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-euc_kr.c" SOURCE="..\strings\ctype-euc_kr.c"
# End Source File # End Source File
# Begin Source File # Begin Source File
......
...@@ -4724,7 +4724,6 @@ Item_func_sp::func_name() const ...@@ -4724,7 +4724,6 @@ Item_func_sp::func_name() const
Field * Field *
Item_func_sp::sp_result_field(void) const Item_func_sp::sp_result_field(void) const
{ {
Field *field;
DBUG_ENTER("Item_func_sp::sp_result_field"); DBUG_ENTER("Item_func_sp::sp_result_field");
if (!m_sp) if (!m_sp)
......
...@@ -7989,7 +7989,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, ...@@ -7989,7 +7989,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
bool using_unique_constraint= 0; bool using_unique_constraint= 0;
bool use_packed_rows= 0; bool use_packed_rows= 0;
bool not_all_columns= !(select_options & TMP_TABLE_ALL_COLUMNS); bool not_all_columns= !(select_options & TMP_TABLE_ALL_COLUMNS);
char *tmpname,path[FN_REFLEN], filename[FN_REFLEN]; char *tmpname,path[FN_REFLEN];
byte *pos,*group_buff; byte *pos,*group_buff;
uchar *null_flags; uchar *null_flags;
Field **reg_field, **from_field; Field **reg_field, **from_field;
......
...@@ -668,7 +668,7 @@ static bool make_empty_rec(THD *thd, File file,enum db_type table_type, ...@@ -668,7 +668,7 @@ static bool make_empty_rec(THD *thd, File file,enum db_type table_type,
{ {
int error; int error;
Field::utype type; Field::utype type;
uint firstpos, null_count; uint null_count;
uchar *buff,*null_pos; uchar *buff,*null_pos;
TABLE table; TABLE table;
create_field *field; create_field *field;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment