summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.h
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-01-29 17:31:20 +0400
committerunknown <bar@bar.mysql.r18.ru>2003-01-29 17:31:20 +0400
commit307ed01440291b47e938073666f5e77c62eefb8c (patch)
tree264982c7494f97fc034269d9b20c340299092a4b /sql/item_strfunc.h
parent6a188877d440749e51aafdc98e4e656ae166d9ba (diff)
downloadmariadb-git-307ed01440291b47e938073666f5e77c62eefb8c.tar.gz
Move latin1 into a separarte file
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r--sql/item_strfunc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 339a49a3580..68675eafc52 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -526,12 +526,12 @@ public:
{
String *tmp=args[0]->val_str(a);
null_value=args[0]->null_value;
- tmp->set_charset(my_charset_bin);
+ tmp->set_charset(&my_charset_bin);
return tmp;
}
void fix_length_and_dec()
{
- set_charset(my_charset_bin);
+ set_charset(&my_charset_bin);
max_length=args[0]->max_length;
}
void print(String *str) { print_op(str); }
@@ -547,7 +547,7 @@ public:
const char *func_name() const { return "load_file"; }
void fix_length_and_dec()
{
- set_charset(my_charset_bin);
+ set_charset(&my_charset_bin);
maybe_null=1;
max_length=MAX_BLOB_WIDTH;
}