diff options
| -rwxr-xr-x | scripts/make_win_src_distribution.sh | 6 | ||||
| -rw-r--r-- | sql/item.h | 2 |
2 files changed, 7 insertions, 1 deletions
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 @@ -259,6 +259,12 @@ do 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; } }; |