diff options
| author | unknown <sergefp@mysql.com> | 2004-04-13 02:18:09 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-04-13 02:18:09 +0400 |
| commit | 6310fa7ee380ca03daa5b7e279df489dc8904ce4 (patch) | |
| tree | 073a7565e0619d427b5224ddce1fd0b15eb02c06 /sql/item.h | |
| parent | fc67a82899a640859306f5d59213d0b7e837a63a (diff) | |
| parent | e69f8367b853b531b0229ac0820419eed247693f (diff) | |
| download | mariadb-git-6310fa7ee380ca03daa5b7e279df489dc8904ce4.tar.gz | |
Merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Manual merge
sql/sql_prepare.cc:
Manual merge
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 0f2927b0d99..25b8bbe06a6 100644 --- a/sql/item.h +++ b/sql/item.h @@ -413,6 +413,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); |