Fix broken windows distribution workspace file (libmysql.dsp), which is...

Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files

VC++Files/client/mysqlclient.dsp

@@ -144,10 +144,6 @@ SOURCE="..\strings\ctype-latin1.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\strings\ctype-latin1_de.c"
-# End Source File
-# Begin Source File
-
 SOURCE="..\strings\ctype-mb.c"
 # End Source File
 # Begin Source File

VC++Files/libmysql/libmysql.dsp

@@ -58,8 +58,8 @@ LINK32=link.exe
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Desc=Copy .lib file
-PostBuild_Cmds=xcopy  release\libmysql.lib   ..\lib_release\
+PostBuild_Desc=Move DLL export lib
+PostBuild_Cmds=xcopy release\libmysql.lib ..\lib_release /y
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "libmysql - Win32 Debug"
@@ -91,8 +91,8 @@ LINK32=link.exe
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Desc=Copy .lib file
-PostBuild_Cmds=xcopy   ..\lib_debug\libmysql.dll   C:\winnt\system32\  	xcopy  debug\libmysql.lib   ..\lib_debug\
+PostBuild_Desc=Move DLL export lib
+PostBuild_Cmds=xcopy ..\lib_debug\libmysql.dll C:\winnt\system32\ /y	xcopy     debug\libmysql.lib ..\lib_debug\ /y
 # End Special Build Tool
 
 !ENDIF
@@ -155,10 +155,6 @@ SOURCE="..\strings\ctype-latin1.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\strings\ctype-latin1_de.c"
-# End Source File
-# Begin Source File
-
 SOURCE="..\strings\ctype-mb.c"
 # End Source File
 # Begin Source File

VC++Files/strings/strings.dsp

@@ -140,10 +140,6 @@ SOURCE=".\ctype-latin1.c"
 # End Source File
 # Begin Source File
 
-SOURCE=".\ctype-latin1_de.c"
-# End Source File
-# Begin Source File
-
 SOURCE=".\ctype-mb.c"
 # End Source File
 # Begin Source File

include/mysql.h

@@ -570,6 +570,7 @@ MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_seek(MYSQL_STMT *stmt,
                                              MYSQL_ROW_OFFSET offset);
 MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_tell(MYSQL_STMT *stmt);
 void STDCALL mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong offset);
+my_ulonglong STDCALL mysql_stmt_num_rows(MYSQL_STMT *stmt);
 
 /* status return codes */
 #define MYSQL_NO_DATA      100

libmysql/libmysql.c

@@ -5467,11 +5467,7 @@ mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong row)
   DBUG_ENTER("mysql_stmt_data_seek");
   DBUG_PRINT("enter",("row id to seek: %ld",(long) row));
   
-  if (!(result= stmt->result))
-  {
-    DBUG_PRINT("exit", ("stmt doesn't contain any resultset"));
-  }
-  else
+  if ((result= stmt->result))
   {
     MYSQL_ROWS	*tmp= 0;
     if (result->data)
@@ -5479,6 +5475,23 @@ mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong row)
     result->current_row= 0;
     result->data_cursor= tmp;
   }
+  else
+    DBUG_PRINT("exit", ("stmt doesn't contain any resultset"));
+}
+
+/*
+  Return total rows the current statement result set
+*/
+
+my_ulonglong STDCALL mysql_stmt_num_rows(MYSQL_STMT *stmt)
+{
+  DBUG_ENTER("mysql_stmt_num_rows");
+    
+  if (stmt->result)
+    DBUG_RETURN(stmt->result->row_count);
+  
+  DBUG_PRINT("exit", ("stmt doesn't contain any resultset"));
+  DBUG_RETURN(0);
 }
 
 /********************************************************************

scripts/make_win_src_distribution.sh

@@ -145,8 +145,7 @@ rm -r -f "$BASE/share/Makefile.am"
 
 if [ -d $BASE/SCCS ]  
 then
-  find $BASE/ -name SCCS -print | xargs rm -r -f
-  rm -r -f "$BASE/InstallShield/Script Files/SCCS"  
+  find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f
 fi
 
 mkdir $BASE/Docs $BASE/extra $BASE/include
@@ -161,7 +160,7 @@ copy_dir_files() {
   for arg do
     print_debug "Copying files from directory '$arg'"
     cd $SOURCE/$arg/
-    for i in *.c *.h *.ih *.i *.ic *.asm \
+    for i in *.c *.h *.ih *.i *.ic *.asm *.def \
              README INSTALL* LICENSE 
     do 
       if [ -f $i ] 

sql/item.cc

@@ -552,10 +552,8 @@ String *Item_param::query_val_str(String* str)
 { 
   switch (item_result_type) {
   case INT_RESULT:
-    str->set(int_value, default_charset());
-    break;
   case REAL_RESULT:
-    set->set(real_value, 2, default_charset());
+    return val_str(str);
     break;
   default:
     str->set("'", 1, default_charset());
@@ -599,13 +597,13 @@ String *Item_param::query_val_str(String* str)
         case TIMESTAMP_FULL:
           sprintf(buff, "%04d-%02d-%02d %02d:%02d:%02d",
  	                ltime.year,ltime.month,ltime.day,
-	                ltime.hour,ltime.minute,ltime.second));
+	                ltime.hour,ltime.minute,ltime.second);
           str->append(buff, 19);
           break;
         case TIMESTAMP_TIME:
         {
           sprintf(buff, "%02d:%02d:%02d",
-	  	        ltime.hour,ltime.minute,ltime.second));
+	  	            ltime.hour,ltime.minute,ltime.second);
           str->append(buff, 8);
           break;
         }

sql/item_strfunc.cc

@@ -2919,7 +2919,7 @@ String *Item_func_spatial_collection::val_str(String *str)
 }
 
 #ifdef HAVE_COMPRESS
-#include <zlib.h>
+#include "../zlib/zlib.h"
 
 String *Item_func_compress::val_str(String *str)
 {

sql/sql_analyse.cc

@@ -283,7 +283,6 @@ void field_str::add()
   char buff[MAX_FIELD_WIDTH], *ptr;
   String s(buff, sizeof(buff),&my_charset_bin), *res;
   ulong length;
-  TREE_ELEMENT *element;
 
   if (!(res = item->val_str(&s)))
   {