diff options
| author | unknown <sergefp@mysql.com> | 2004-04-05 19:52:10 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-04-05 19:52:10 +0400 |
| commit | fbfdff7fb0b0e508db55151480c0135376b2bcd2 (patch) | |
| tree | 407b4365ecfe2d3c7bbae1190bc79ebb9fc9ba5c /sql/item.h | |
| parent | 66de313563a74099d416767fec884ab590530d31 (diff) | |
| parent | ef8a5401f146e0aa17d9cc342c52a82e16e7c6ef (diff) | |
| download | mariadb-git-fbfdff7fb0b0e508db55151480c0135376b2bcd2.tar.gz | |
Post-merge fixes
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
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 902f42dd07c..1ce9a1c0a4a 100644 --- a/sql/item.h +++ b/sql/item.h @@ -412,6 +412,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); |