diff options
| author | unknown <peter@mysql.com> | 2002-10-30 18:03:09 +0300 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-10-30 18:03:09 +0300 |
| commit | 77abf6d4b2a3b6ed151dbe2e294d2d6e53da2356 (patch) | |
| tree | 8bd39cc530934689b6d045488a6371a35057bb42 /sql/item_strfunc.h | |
| parent | 03437238ee35c1f3f28adb9061389317bd7df206 (diff) | |
| parent | 1de7b502743db94e26f0815b4f113a043477ef62 (diff) | |
| download | mariadb-git-77abf6d4b2a3b6ed151dbe2e294d2d6e53da2356.tar.gz | |
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index c4b2534c7d0..03e58705ce5 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -485,7 +485,7 @@ public: } void fix_length_and_dec() { - str_value.set_charset(my_charset_bin); + set_charset(my_charset_bin); max_length=args[0]->max_length; } void print(String *str) { print_op(str); } @@ -501,7 +501,7 @@ public: const char *func_name() const { return "load_file"; } void fix_length_and_dec() { - str_value.set_charset(my_charset_bin); + set_charset(my_charset_bin); maybe_null=1; max_length=MAX_BLOB_WIDTH; } |