Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/my/mysql-5.0

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

netware/BUILD/mwenv

@@ -19,9 +19,9 @@ export AR='mwldnlm'
 export AR_FLAGS='-type library -o'
 export AS='mwasmnlm'
 export CC='mwccnlm -gccincludes'
-export CFLAGS='-O3 -align 8 -proc 686 -relax_pointers -dialect c'
+export CFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c'
 export CXX='mwccnlm -gccincludes'
-export CXXFLAGS='-O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
+export CXXFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
 export LD='mwldnlm'
 export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption'
 export RANLIB=:

netware/mysqld_safe.c

@@ -666,7 +666,6 @@ void mysql_start(int argc, char *argv[])
       if (!strnicmp(argv[i], private_options[j], strlen(private_options[j])))
       {
 	skip= TRUE;
-	consoleprintf("The argument skipped is %s\n", argv[i]);
 	break;
       }
     }
@@ -674,7 +673,6 @@ void mysql_start(int argc, char *argv[])
     if (!skip)
     {
       add_arg(&al, "%s", argv[i]);
-      consoleprintf("The final argument is %s\n", argv[i]);
     }
   }
   // spawn

sql/item_func.cc

@@ -4725,7 +4725,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)

sql/sql_select.cc

@@ -7996,7 +7996,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;

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;