summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2004-04-05 19:52:10 +0400
committersergefp@mysql.com <>2004-04-05 19:52:10 +0400
commit1f8505d66f47bd8b7d8493a8db5c8dd708f7e103 (patch)
tree407b4365ecfe2d3c7bbae1190bc79ebb9fc9ba5c /sql/item.h
parent03caa47acba6cf3f85e99459e5a972a00a90af47 (diff)
parenta8386d01c21c1dd24ab1f86232b1d5d5633ad2eb (diff)
downloadmariadb-git-1f8505d66f47bd8b7d8493a8db5c8dd708f7e103.tar.gz
Post-merge fixes
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h1
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);