summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorramil/ram@mysql.com/myoffice.izhnet.ru <>2006-08-10 15:06:22 +0500
committerramil/ram@mysql.com/myoffice.izhnet.ru <>2006-08-10 15:06:22 +0500
commit50ae5b7989e6148bee11a718c72ebfdade2ccdc8 (patch)
tree0a28f24a1037885943d5f500cd072fa77358df6b /myisam
parent8e4460343fb968cb9cd55da963535c45e48fc5eb (diff)
downloadmariadb-git-50ae5b7989e6148bee11a718c72ebfdade2ccdc8.tar.gz
Fix for bug #20709: Collation not used in group by on 4.1.
myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing TEXT and VARTTEXT key segments.
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_unique.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_unique.c b/myisam/mi_unique.c
index b5baa448609..1a116e50174 100644
--- a/myisam/mi_unique.c
+++ b/myisam/mi_unique.c
@@ -185,7 +185,7 @@ int mi_unique_comp(MI_UNIQUEDEF *def, const byte *a, const byte *b,
if (type == HA_KEYTYPE_TEXT || type == HA_KEYTYPE_VARTEXT)
{
if (mi_compare_text(keyseg->charset, (uchar *) pos_a, length,
- (uchar *) pos_b, length, 0, 0))
+ (uchar *) pos_b, length, 0, 1))
return 1;
}
else