diff options
| author | unknown <sergefp@mysql.com> | 2004-05-06 23:02:32 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-05-06 23:02:32 +0400 |
| commit | 6810ca1b71e049cc86adbc12bebedbce41d03a7c (patch) | |
| tree | 50153bc4a1b4f760b75c16f4627a54730d261de3 /sql/item.h | |
| parent | 151495baf78b0a5e282a0e77fdba1a7a2a8a3085 (diff) | |
| parent | 60017fb2609f6993e941f662d79a8f1d44cfa11b (diff) | |
| download | mariadb-git-6810ca1b71e049cc86adbc12bebedbce41d03a7c.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/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_yacc.yy:
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 780e2fcadac..fb7a344076d 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); |