diff options
| author | lenz@mysql.com <> | 2005-06-06 15:23:04 +0200 |
|---|---|---|
| committer | lenz@mysql.com <> | 2005-06-06 15:23:04 +0200 |
| commit | 13afa9129bb2c949147b2c0d84b39982e3575015 (patch) | |
| tree | cd4685a1af6e9aab4c77e0609826ad2fbaa41cf0 | |
| parent | dcae1d174f6d4fe4cabd116a215ce1036aa97bd0 (diff) | |
| download | mariadb-git-13afa9129bb2c949147b2c0d84b39982e3575015.tar.gz | |
Some Windows compile improvements:
- removed some unreferenced variables
- fixed the libmysql project file by removing a duplicate file reference (merge error)
| -rw-r--r-- | VC++Files/libmysql/libmysql.dsp | 4 | ||||
| -rw-r--r-- | sql/item_func.cc | 1 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 | ||||
| -rw-r--r-- | sql/unireg.cc | 2 |
4 files changed, 2 insertions, 7 deletions
diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp index 4f93ac93c40..32d32fd6b2c 100644 --- a/VC++Files/libmysql/libmysql.dsp +++ b/VC++Files/libmysql/libmysql.dsp @@ -147,10 +147,6 @@ SOURCE="..\strings\ctype-czech.c" # End Source File # Begin Source File -SOURCE="..\strings\ctype-cp932.c" -# End Source File -# Begin Source File - SOURCE="..\strings\ctype-euc_kr.c" # End Source File # Begin Source File diff --git a/sql/item_func.cc b/sql/item_func.cc index 5af99cb8132..e308df64f96 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4724,7 +4724,6 @@ Item_func_sp::func_name() const Field * Item_func_sp::sp_result_field(void) const { - Field *field; DBUG_ENTER("Item_func_sp::sp_result_field"); if (!m_sp) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 27ef3fcea6f..9690bfdb236 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7989,7 +7989,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, bool using_unique_constraint= 0; bool use_packed_rows= 0; 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; uchar *null_flags; Field **reg_field, **from_field; diff --git a/sql/unireg.cc b/sql/unireg.cc index eda17d8f4a9..e8aad2fedd0 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -668,7 +668,7 @@ static bool make_empty_rec(THD *thd, File file,enum db_type table_type, { int error; Field::utype type; - uint firstpos, null_count; + uint null_count; uchar *buff,*null_pos; TABLE table; create_field *field; |