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

into mashka.mysql.fi:/home/my/mysql-4.1

scripts/make_win_src_distribution.sh

@@ -258,6 +258,12 @@ do
   fi
 done
 
+#
+# Fix some windows files
+#
+
+./extra/replace std:: "" -- $BASE/sql/sql_yacc.cpp
+
 #
 # Initialize the initial data directory
 #

sql/item.h

@@ -457,7 +457,7 @@ public:
   longlong val_int();
   String *val_str(String*) { return &str_value; }
   int save_in_field(Field *field, bool no_conversions);
-  enum Item_result result_type () const { return INT_RESULT; }
+  enum Item_result result_type () const { return STRING_RESULT; }
   enum_field_types field_type() const { return MYSQL_TYPE_STRING; }
 };