bk commit into 5.0 tree (lenz:1.1923)

[lenz]

Below is the list of changes that have just been committed into a local
5.0 repository of lenz. When lenz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1923 05/06/06 15:23:04 lenz@stripped +4 -0
  Some Windows compile improvements:
   - removed some unreferenced variables
   - fixed the libmysql project file by removing a duplicate file reference (merge error)

  VC++Files/libmysql/libmysql.dsp
    1.33 05/06/06 15:22:56 lenz@stripped +0 -4
    - after-merge fix: removed duplicate file ctype-cp932.c

  sql/unireg.cc
    1.62 05/06/06 15:00:17 lenz@stripped +1 -1
    - removed unused variable "firstpos" from make_empty_rec

  sql/sql_select.cc
    1.325 05/06/06 14:34:33 lenz@stripped +1 -1
    - removed unreferenced variable "filename" from create_tmp_table

  sql/item_func.cc
    1.211 05/06/06 14:17:39 lenz@stripped +0 -1
    - removed unused variable "Field" from Item_func_sp::sp_result_field

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-5.0-build

--- 1.210/sql/item_func.cc	2005-06-03 13:42:57 +02:00
+++ 1.211/sql/item_func.cc	2005-06-06 14:17:39 +02:00
@@ -4724,7 +4724,6 @@
 Field *
 Item_func_sp::sp_result_field(void) const
 {
-  Field *field;
   DBUG_ENTER("Item_func_sp::sp_result_field");
 
   if (!m_sp)

--- 1.324/sql/sql_select.cc	2005-06-02 20:55:30 +02:00
+++ 1.325/sql/sql_select.cc	2005-06-06 14:34:33 +02:00
@@ -7989,7 +7989,7 @@
   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;

--- 1.61/sql/unireg.cc	2005-05-26 01:38:24 +02:00
+++ 1.62/sql/unireg.cc	2005-06-06 15:00:17 +02:00
@@ -668,7 +668,7 @@
 {
   int error;
   Field::utype type;
-  uint firstpos, null_count;
+  uint null_count;
   uchar *buff,*null_pos;
   TABLE table;
   create_field *field;

--- 1.32/VC++Files/libmysql/libmysql.dsp	2005-06-02 15:30:37 +02:00
+++ 1.33/VC++Files/libmysql/libmysql.dsp	2005-06-06 15:22:56 +02:00
@@ -147,10 +147,6 @@
 # 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