diff options
| author | unknown <sergefp@mysql.com> | 2004-05-07 03:33:39 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-05-07 03:33:39 +0400 |
| commit | d55809d8911f0a2c479d99770624deb07a71a974 (patch) | |
| tree | 1bf1a4b154ec42ff1b195c79c54a86b9f8bfdf4a /sql/item.h | |
| parent | 33e6b2af85ec92a65669af5330f187f1d39e2b7a (diff) | |
| parent | dee8f22c079addf7ed2a27ea6ed73a81f52c5cb7 (diff) | |
| download | mariadb-git-d55809d8911f0a2c479d99770624deb07a71a974.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_lex.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 99a0516e439..471d502a6e1 100644 --- a/sql/item.h +++ b/sql/item.h @@ -414,6 +414,7 @@ public: void set_int(longlong i); void set_double(double i); void set_value(const char *str, uint length); + void set_value(const char *str, uint length, CHARSET_INFO *ci); void set_long_str(const char *str, ulong length); void set_long_binary(const char *str, ulong length); void set_longdata(const char *str, ulong length); |