summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorbar@bar.intranet.mysql.r18.ru <>2004-03-03 11:22:25 +0400
committerbar@bar.intranet.mysql.r18.ru <>2004-03-03 11:22:25 +0400
commitc93ff40c51896506bc33649f4f33cea3febad361 (patch)
treebe96397a4bf4d3f6595a1f65bd2fd9e8f7760447 /sql/item.h
parenteb2783cd9140c7de8883fac9b320de2bb6b79a41 (diff)
downloadmariadb-git-c93ff40c51896506bc33649f4f33cea3febad361.tar.gz
Bug #2959 UTF8 charset breaks joins with mixed column/string constant
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h
index 59c030f3db5..727132916f0 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -533,7 +533,8 @@ public:
bool eq(const Item *item, bool binary_cmp) const;
Item *new_item()
{
- return new Item_string(name, str_value.ptr(), max_length, &my_charset_bin);
+ return new Item_string(name, str_value.ptr(),
+ str_value.length(), &my_charset_bin);
}
String *const_string() { return &str_value; }
inline void append(char *str, uint length) { str_value.append(str, length); }