diff options
| author | igor@rurik.mysql.com <> | 2005-02-17 00:34:06 -0800 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2005-02-17 00:34:06 -0800 |
| commit | 5a3806e5df98410a60bdf56f2bfcab31899522d2 (patch) | |
| tree | 1b0577030910b1fa4db93fa7211baf8b69a4a404 /sql/item.h | |
| parent | a2c728b2ca9fce9e917a0ebbdab8c640ec7d0fc3 (diff) | |
| parent | d2730b3342cb3680b92cbf135b852c4a1abcf0fc (diff) | |
| download | mariadb-git-5a3806e5df98410a60bdf56f2bfcab31899522d2.tar.gz | |
Manual merge
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 7d9526b53a8..3e1844ec76e 100644 --- a/sql/item.h +++ b/sql/item.h @@ -985,7 +985,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; } |