diff options
| author | monty@mashka.mysql.fi <> | 2003-05-06 06:21:40 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-05-06 06:21:40 +0300 |
| commit | 091d6f3b731d94128d3f35942126a29e2cadae49 (patch) | |
| tree | a13ebeb00f4479929579e8616f9a8424e1358f41 /sql | |
| parent | c858d725885289386998d146592c43e42c559acf (diff) | |
| parent | 1e2f2ae037bf7ebc7b4068e0b3a95f1282af9729 (diff) | |
| download | mariadb-git-091d6f3b731d94128d3f35942126a29e2cadae49.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
Diffstat (limited to 'sql')
| -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; } }; |