From d6e4b6a90ea52068ebdd27d39ff3fb88192ce223 Mon Sep 17 00:00:00 2001
From: unknown <monty@mashka.mysql.fi>
Date: Tue, 6 May 2003 06:20:16 +0300
Subject: [PATCH] Varbinary should be string as default

scripts/make_win_src_distribution.sh:
  make sql_yacc.cpp portable
---
 scripts/make_win_src_distribution.sh | 6 ++++++
 sql/item.h                           | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index 7fd37a52b30..73600d5749b 100755
--- a/scripts/make_win_src_distribution.sh
+++ b/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
 #
diff --git a/sql/item.h b/sql/item.h
index 4862ad21fbe..6603e11166b 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -456,7 +456,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; }
 };