diff options
| author | unknown <igor@rurik.mysql.com> | 2005-02-16 22:51:32 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-02-16 22:51:32 -0800 |
| commit | 41c0945096fe6f6074e7a994e6784432d60211f1 (patch) | |
| tree | dd1af9ee13abba6d19f69718547d514cd701a982 /sql/item.h | |
| parent | d2a69d8f7d99fc806d98f319741b13275ae31e68 (diff) | |
| download | mariadb-git-41c0945096fe6f6074e7a994e6784432d60211f1.tar.gz | |
item.h:
Revised the fix for bug #7098.
Corrected the method Item_string::new_item.
sql_select.cc:
Revised the fix for bug #7098.
Aborted the previous modifications.
sql/sql_select.cc:
Revised the fix for bug #7098.
Aborted the previous modifications.
sql/item.h:
Revised the fix for bug #7098.
Corrected the method Item_string::new_item.
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index db5010799fa..dd06d4ce61a 100644 --- a/sql/item.h +++ b/sql/item.h @@ -742,7 +742,7 @@ public: Item *new_item() { return new Item_string(name, str_value.ptr(), - str_value.length(), &my_charset_bin); + str_value.length(), collation.collation); } Item *safe_charset_converter(CHARSET_INFO *tocs); String *const_string() { return &str_value; } |