1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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


sql/item.h:
  Auto merged
This commit is contained in:
unknown 2003-05-06 06:21:40 +03:00
commit 1785df1e98
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/make_win_src_distribution.sh
View File

@ -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
# #

2
sql/item.h
View File

@ -457,7 +457,7 @@ public:
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; }
}; };