Commit da23e707 authored by unknown's avatar unknown

Varbinary should be string as default


scripts/make_win_src_distribution.sh:
  make sql_yacc.cpp portable
parent 43ea2a18
...@@ -258,6 +258,12 @@ do ...@@ -258,6 +258,12 @@ do
fi fi
done done
#
# Fix some windows files
#
./extra/replace std:: "" -- $BASE/sql/sql_yacc.cpp
# #
# Initialize the initial data directory # Initialize the initial data directory
# #
......
...@@ -456,7 +456,7 @@ class Item_varbinary :public Item ...@@ -456,7 +456,7 @@ class Item_varbinary :public Item
longlong val_int(); longlong val_int();
String *val_str(String*) { return &str_value; } String *val_str(String*) { return &str_value; }
int save_in_field(Field *field, bool no_conversions); 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; } enum_field_types field_type() const { return MYSQL_TYPE_STRING; }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment