diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-05-06 06:21:40 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-05-06 06:21:40 +0300 |
| commit | f3a80a70299389a9d82ea159c3349423c76ba6b7 (patch) | |
| tree | a13ebeb00f4479929579e8616f9a8424e1358f41 /sql/item.h | |
| parent | 471df17c91db9424dbc28ffbe076f612394dd56f (diff) | |
| parent | da23e707bd99029e073e2b002ab8604f5d3ef03e (diff) | |
| download | mariadb-git-f3a80a70299389a9d82ea159c3349423c76ba6b7.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
sql/item.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 3a5a06c3af3..111892df688 100644 --- a/sql/item.h +++ b/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; } }; |